Changeset 66

Timestamp:

06/13/06 12:44:39 (18 years ago)

Author:

kdeugau

Message:

/trunk

Fix buglet where Patchnn: and %patch macro expansion didn't quite
work - corner case where no options to patch were supplied

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -455 +455 @@
                 qq([ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root .\n).
                 qq(/bin/chmod -Rf a+rX,g-w,o-w .\n);
-          } elsif (/^\%patch([^:]+)\s+(.+)$/) {
-            $prepscript .= "patch $2 <$topdir/SOURCES/".$pkgdata{main}{"patch$1"}."\n";
+          } elsif ( my ($patchnum,$patchopts) = (/^\%patch([^:]+)(\s+.+)?$/) ) {
+            $prepscript .= "patch ";
+            $prepscript .= $patchopts if $patchopts;
+            $prepscript .= " <$topdir/SOURCES/".$pkgdata{main}{"patch$patchnum"}."\n";
           } else {
             last PREPSCRIPT if /^\%/;
@@ -625 +627 @@
           $pkgdata{main}{$patchname} = $patchbits[$#patchbits];
         }
+        chomp $pkgdata{main}{$patchname};
       } elsif (/^buildreq(?:uires)?:\s+(.+)/i) {
         $buildreq .= ", $1";