The following commit has been merged in the master branch:
commit d2d24e8b2f901ecd76ceb733b2cea963eb935b04
Author: Raphaël Hertzog <[email protected]>
Date: Sun Aug 16 13:47:58 2009 +0200
dpkg-scanpackages: rename --extraoverride into --extra-override
Also fix the help output to be properly indented and fix
load_extra_override() to use its parameter.
diff --git a/man/dpkg-scanpackages.1 b/man/dpkg-scanpackages.1
index 5c6bfac..9f7a1d1 100644
--- a/man/dpkg-scanpackages.1
+++ b/man/dpkg-scanpackages.1
@@ -78,7 +78,7 @@ Scan for *.\fItype\fP packages, instead of *.deb.
.BR \-u ", " \-\-udeb
\fBObsolete\fP alias for \fB-tudeb\fP.
.TP
-.BR \-e ", " \-\-extraoverride " \fIfile\fP"
+.BR \-e ", " \-\-extra\-override " \fIfile\fP"
Scan \fIfile\fP to find supplementary overrides. Each line contains 3
space separated fields: package name, field name to override, new field value.
.TP
diff --git a/man/po/de.po b/man/po/de.po
index 7ffc3ad..17b2651 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -8366,8 +8366,8 @@ msgstr "B<-u>, B<--udeb>"
msgid "B<Obsolete> alias for B<-tudeb>."
msgstr "B<Veralteter> Alias f�r B<-tudeb>."
-msgid "B<-e>, B<--extraoverride> I<file>"
-msgstr "B<-e>, B<--extraoverride> I<Datei>"
+msgid "B<-e>, B<--extra-override> I<file>"
+msgstr "B<-e>, B<--extra-override> I<Datei>"
msgid ""
"Scan I<file> to find supplementary overrides. Each line contains 3 space "
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index dcb18a2..67603ab 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -46,12 +46,12 @@ my %options = (help => sub { usage(); exit 0; },
udeb => \&set_type_udeb,
arch => undef,
multiversion => 0,
- extraoverride => undef,
+ 'extra-override'=> undef,
);
my $result = GetOptions(\%options,
'help|h|?', 'version', 'type|t=s', 'udeb|u!',
- 'arch|a=s', 'multiversion|m!', 'extraoverride|e=s');
+ 'arch|a=s', 'multiversion|m!', 'extra-override|e=s');
sub version {
printf _g("Debian %s version %s.\n"), $progname, $version;
@@ -67,7 +67,8 @@ Options:
-u, --udeb scan for udebs (obsolete alias for -tudeb).
-a, --arch <arch> architecture to scan for.
-m, --multiversion allow multiple versions of a single package.
- -e, --extraoverride <file> extra override file.
+ -e, --extra-override <file>
+ use extra override file.
-h, --help show this help message.
--version show the version.
"), $progname;
@@ -128,8 +129,9 @@ sub load_override
sub load_override_extra
{
- my $override_fh = new IO::File $options{extraoverride}, 'r' or
- syserr(_g("Couldn't open override file %s"), $options{extraoverride});
+ my $extra_override = shift;
+ my $override_fh = new IO::File $extra_override, 'r' or
+ syserr(_g("Couldn't open override file %s"), $extra_override);
while (<$override_fh>) {
s/\#.*//;
@@ -256,7 +258,7 @@ FILE:
close($find_h);
load_override($override) if defined $override;
-load_override_extra($options{extraoverride}) if defined
$options{extraoverride};
+load_override_extra($options{'extra-override'}) if defined
$options{'extra-override'};
my @missingover=();
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
