Changeset 66 for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debbuild

    r65 r66  
    455455                qq([ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root .\n).
    456456                qq(/bin/chmod -Rf a+rX,g-w,o-w .\n);
    457           } elsif (/^\%patch([^:]+)\s+(.+)$/) {
    458             $prepscript .= "patch $2 <$topdir/SOURCES/".$pkgdata{main}{"patch$1"}."\n";
     457          } elsif ( my ($patchnum,$patchopts) = (/^\%patch([^:]+)(\s+.+)?$/) ) {
     458            $prepscript .= "patch ";
     459            $prepscript .= $patchopts if $patchopts;
     460            $prepscript .= " <$topdir/SOURCES/".$pkgdata{main}{"patch$patchnum"}."\n";
    459461          } else {
    460462            last PREPSCRIPT if /^\%/;
     
    625627          $pkgdata{main}{$patchname} = $patchbits[$#patchbits];
    626628        }
     629        chomp $pkgdata{main}{$patchname};
    627630      } elsif (/^buildreq(?:uires)?:\s+(.+)/i) {
    628631        $buildreq .= ", $1";
Note: See TracChangeset for help on using the changeset viewer.