r171 - in trunk: . debian scripts

[Frank Lichtenheld]

Author: djpig
Date: 2006-02-19 13:54:29 +0000 (Sun, 19 Feb 2006)
New Revision: 171

Modified:
   trunk/ChangeLog
   trunk/debian/changelog
   trunk/scripts/dpkg-scanpackages.pl
Log:
dpkg-scanpackages: Fix option parsing of arch option. Also fix a mistake
in constructing @find_args.
Closes: #353506


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2006-02-19 12:09:33 UTC (rev 170)
+++ trunk/ChangeLog     2006-02-19 13:54:29 UTC (rev 171)
@@ -1,3 +1,9 @@
+2006-02-19  Frank Lichtenheld  <[EMAIL PROTECTED]>
+
+       * scripts/dpkg-scanpackages.pl: Fix option
+       parsing of arch option. Also fix a mistake
+       in constructing @find_args.
+
 2006-02-18  Frank Lichtenheld  <[EMAIL PROTECTED]>
 
        * scripts/dpkg-gencontrol.pl: Call parsedep

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2006-02-19 12:09:33 UTC (rev 170)
+++ trunk/debian/changelog      2006-02-19 13:54:29 UTC (rev 171)
@@ -4,6 +4,7 @@
   * 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).

Modified: trunk/scripts/dpkg-scanpackages.pl
===================================================================
--- trunk/scripts/dpkg-scanpackages.pl  2006-02-19 12:09:33 UTC (rev 170)
+++ trunk/scripts/dpkg-scanpackages.pl  2006-02-19 13:54:29 UTC (rev 171)
@@ -43,7 +43,7 @@
 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 $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");


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]