dpkg-scanpackages: Fix option parsing of arch option. Also fix a mistake

in constructing @find_args.
Closes: #353506

diff --git a/ChangeLog b/ChangeLog
index e116840beae39af9e6d7f4a843f34b1e296b2812..cd5c2e071942a36e0d0ad3f9f052905e98c5257a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-19  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/dpkg-scanpackages.pl: Fix option
+       parsing of arch option. Also fix a mistake
+       in constructing @find_args.
+
 2006-02-18  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/dpkg-gencontrol.pl: Call parsedep

diff --git a/debian/changelog b/debian/changelog
index 2f6843fb544dabac72267244e8269d6a6c9f3803..a70cf295ed2a2794bc6f12e64256cb683d91cd3b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dpkg (1.13.17~) UNRELEASED; urgency=low
   * Fix handling of -DArchitecure=foo in dpkg-gencontrol. Closes: #251911
   * Handle architectures in all dependency fields in debian/control,
     even those of binary packages. Closes: #252657, #324741, #347819
+  * More dpkg-scanpackages fixes (--arch option handling). Closes: #353506
 
   [ Updated dselect Translations ]
   * hu.po (SZERVÁC Attila).

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index bbda6c6d4df194a05fc834bbf3bf95dde56b7b1a..2bc2b5a7f40475e6e06a885560d28913e9e10ce9 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -43,7 +43,7 @@ my @fieldpri= ('Package',
 my %field_case;
 @field_case{map{lc($_)} @fieldpri} = @fieldpri;
 
-use Getopt::Long;
+use Getopt::Long qw(:config bundling);
 
 my %options = (help            => 0,
               udeb            => 0,
@@ -71,7 +71,7 @@ my $arch = $options{arch};
 my $ext = $options{udeb} ? 'udeb' : 'deb';
 my @find_args;
 if ($options{arch}) {
-     @find_args = ('(','-name',"*_all.$ext",'-o','-name',"_${arch}.$ext",')',);
+     @find_args = ('(','-name',"*_all.$ext",'-o','-name',"*_${arch}.$ext",')',);
 }
 else {
      @find_args = ('-name',"*.$ext");