RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 03-Jul-2007 17:24:30
Branch: HEAD Handle: 2007070316243000
Modified files:
rpm/build parsePrep.c
Log:
use macro %__tar instead of %_tarbin and fix memory handling of
'patch' variable by allocating the fallback string
Summary:
Revision Changes Path
2.77 +3 -3 rpm/build/parsePrep.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.76 -r2.77 parsePrep.c
--- rpm/build/parsePrep.c 3 Jul 2007 00:55:39 -0000 2.76
+++ rpm/build/parsePrep.c 3 Jul 2007 15:24:30 -0000 2.77
@@ -130,7 +130,7 @@
patch = rpmGetPath("%{__patch}", NULL);
if (strcmp(patch, "%{__patch}") == 0)
- patch = "patch";
+ patch = xstrdup("patch");
if (compressed) {
const char *zipper;
@@ -238,8 +238,8 @@
/[EMAIL PROTECTED]@*/ break;
}
- tar = rpmGetPath("%{_tarbin}", NULL);
- if (strcmp(tar, "%{_tarbin}") == 0)
+ tar = rpmGetPath("%{__tar}", NULL);
+ if (strcmp(tar, "%{__tar}") == 0)
tar = xstrdup("tar");
if (compressed != COMPRESSED_NOT) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
