Changeset 91 for trunk

Timestamp:

04/17/07 17:39:37 (18 years ago)

Author:

kdeugau

Message:

/trunk

oops. It would help if --showpkgs generated exactly the same filenames
as a real package build - we need to store 'all' instead of 'noarch' in
$pkgdata{$pkg}{arch}.

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -451 +451 @@
             $dname =~ tr/[A-Z]/[a-z]/;
             if ($dname =~ /^BuildArch/i) {
+              $dvalue =~ s/^noarch/all/ig;
               $buildarch = $dvalue;     # Emulate rpm's behaviour to a degree
               $dname = 'arch';
@@ -693 +694 @@
       } elsif (/^buildarch(?:itecture)?:\s+(.+)/i) {
         $pkgdata{main}{arch} = $1;
+        $pkgdata{main}{arch} =~ s/^noarch$/all/;
         $buildarch = $pkgdata{main}{arch};
       } elsif (/^buildreq(?:uires)?:\s+(.+)/i) {
@@ -814 +816 @@
 
     $pkgdata{$pkg}{arch} = $hostarch if !$pkgdata{$pkg}{arch};  # Just In Case.
-    $pkgdata{$pkg}{arch} =~ s/^noarch/all/ig;
 
     # Make sure we have somewhere to write the .deb file