SPECS: patchtool.pl - quotes, and quotemeta fixed
sparky
sparky at pld-linux.org
Sun Aug 6 18:15:10 CEST 2006
Author: sparky Date: Sun Aug 6 16:15:10 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- quotes, and quotemeta fixed
---- Files affected:
SPECS:
patchtool.pl (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SPECS/patchtool.pl
diff -u SPECS/patchtool.pl:1.1 SPECS/patchtool.pl:1.2
--- SPECS/patchtool.pl:1.1 Fri Aug 4 00:45:10 2006
+++ SPECS/patchtool.pl Sun Aug 6 18:15:05 2006
@@ -156,7 +156,7 @@
$srcdir =~ s#/.*##;
chdir $rpmBUILD;
-system("find '$srcdir' -name *.orig -or -name *~ -print0 | xargs -0 -r -l512 rm -f");
+system("find '$srcdir' -name '*.orig' -or -name '*~' -print0 | xargs -0 -r -l512 rm -f");
my $srcorig = $srcdir.".orig";
my $srcpatch = $srcdir.".".$patch;
@@ -167,8 +167,8 @@
system(@cp);
die "Can't copy from $srcorig to $srcpatch: $!\n" if $?;
-quotemeta $srcdir;
-$builddir =~ s#$srcdir#$srcpatch#;
+my $quotesrc = quotemeta $srcdir;
+$builddir =~ s#$quotesrc#$srcpatch#;
chdir $builddir;
if (-r "$rpmSPECS/../SOURCES/$patch_file") {
@@ -197,7 +197,7 @@
sub make_patch() {
chdir $builddir;
- system("find -name *.orig -or -name *~ -print0 | xargs -0 -r -l512 rm -f");
+ system("find -name '*.orig' -or -name '*~' -print0 | xargs -0 -r -l512 rm -f");
chdir $rpmBUILD;
system("diff -Nur '$srcorig' '$srcpatch' > '$rpmSPECS/../SOURCES/$patch_file'");
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/patchtool.pl?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list