Author: arekm Date: Sat Oct 20 21:48:56 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
rpm-noexpand.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/rpm-noexpand.patch
diff -u SOURCES/rpm-noexpand.patch:1.5 SOURCES/rpm-noexpand.patch:1.6
--- SOURCES/rpm-noexpand.patch:1.5 Fri Nov 18 19:46:20 2005
+++ SOURCES/rpm-noexpand.patch Sat Oct 20 23:48:51 2007
@@ -12,7 +12,7 @@
--- rpm-4.3/build/parseSpec.c.wiget Thu May 15 18:15:51 2003
+++ rpm-4.3/build/parseSpec.c Fri May 16 00:08:57 2003
@@ -156,12 +156,16 @@
- ofi->readPtr = from;
+ /[EMAIL PROTECTED]@*/
/* Don't expand macros (eg. %define) in false branch of %if clause */
+ /* Also don't expand macros in %changelog where we set STRIP_NOEXPAND
flag */
@@ -20,9 +20,9 @@
+ if (!(strip & STRIP_NOEXPAND)) {
if (spec->readStack->reading &&
expandMacros(spec, spec->macros, spec->lbuf, sizeof(spec->lbuf))) {
- rpmError(RPMERR_BADSPEC, _("line %d: %s\n"),
+ rpmlog(RPMLOG_ERR, _("line %d: %s\n"),
spec->lineNum, spec->lbuf);
- return RPMERR_BADSPEC;
+ return RPMRC_FAIL;
}
+ }
spec->nextline = spec->lbuf;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-noexpand.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
