[maemo-commits] [maemo-commits] r16623 - projects/haf/trunk/dpkg

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-11-10 16:58:56 +0200 (Mon, 10 Nov 2008)
New Revision: 16623

Added:
   projects/haf/trunk/dpkg/altdocs.patch
Log:
New.


Added: projects/haf/trunk/dpkg/altdocs.patch
===================================================================
--- projects/haf/trunk/dpkg/altdocs.patch	2008-11-10 14:28:20 UTC (rev 16622)
+++ projects/haf/trunk/dpkg/altdocs.patch	2008-11-10 14:58:56 UTC (rev 16623)
@@ -0,0 +1,41 @@
+Index: scripts/update-alternatives.pl
+===================================================================
+--- scripts/update-alternatives.pl	(revision 16457)
++++ scripts/update-alternatives.pl	(working copy)
+@@ -113,6 +113,21 @@ sub quit
+     exit(2);
+ }
+ 
++# Same as 'quit', but ignore errors related to documentation.
++#
++sub maybe_quit {
++    my ($file, $msg) = @_;
++    printf STDERR "%s: %s\n", $progname, $msg;
++    if ($file =~ "^/usr/share/man/" ||
++	$file =~ "^/usr/share/info/" ||
++	$file =~ "^/usr/share/doc/")
++    {
++	printf STDERR "%s: ignoring error.\n", $progname;
++    } else {
++	exit (2);
++    }
++}
++
+ sub badusage
+ {
+     printf STDERR "%s: %s\n\n", $progname, "@_";
+@@ -705,12 +720,12 @@ sub rename_mv {
+ sub checked_symlink {
+     my ($filename, $linkname) = @_;
+     symlink($filename, $linkname) ||
+-	&quit(sprintf(_g("unable to make %s a symlink to %s: %s"), $linkname, $filename, $!));
++	&maybe_quit($linkname, sprintf(_g("unable to make %s a symlink to %s: %s"), $linkname, $filename, $!));
+ }
+ sub checked_mv {
+     my ($source, $dest) = @_;
+     rename_mv($source, $dest) ||
+-	&quit(sprintf(_g("unable to install %s as %s: %s"), $source, $dest, $!));
++	&maybe_quit($source, sprintf(_g("unable to install %s as %s: %s"), $source, $dest, $!));
+ }
+ sub config_all {
+     opendir ADMINDIR, $admindir or die sprintf(_g("Serious problem: %s"), $!);