From 5c9a08aa53ecda3693eb10a2d5aa0fa3973324de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 20 Oct 2007 21:48:51 +0000 Subject: [PATCH] - updated Changed files: rpm-noexpand.patch -> 1.6 --- rpm-noexpand.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm-noexpand.patch b/rpm-noexpand.patch index 781a54e..589c1bd 100644 --- a/rpm-noexpand.patch +++ b/rpm-noexpand.patch @@ -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; + /*@=mods@*/ /* 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; -- 2.44.0