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

in constructing @find_args.
Closes: #353506

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

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).

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");