From 4fc52f759c02ad82d4df94207956fafad46f47d9 Mon Sep 17 00:00:00 2001 From: marc Date: Mon, 7 Jul 1997 21:13:26 +0000 Subject: [PATCH] Fix handling of %pre -p when it has no body CVS patchset: 1731 CVS date: 1997/07/07 21:13:26 --- build/spec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/build/spec.c b/build/spec.c index 2379bb7..b45c752 100644 --- a/build/spec.c +++ b/build/spec.c @@ -990,9 +990,6 @@ static int finishCurrentPart(Spec spec, StringBuf sb, int t2 = 0; stripTrailingBlanksStringBuf(sb); - if (*(getStringBuf(sb)) == '\0') { - return 0; - } switch (cur_part) { case PREIN_PART: @@ -1038,14 +1035,14 @@ static int finishCurrentPart(Spec spec, StringBuf sb, } break; } - if (t1) { + if (t1 && (*(getStringBuf(sb)) != '\0')) { headerAddEntry(cur_package->header, t1, RPM_STRING_TYPE, getStringBuf(sb), 1); - if (t2) { - addReqProv(cur_package, RPMSENSE_PREREQ, scriptProg, NULL); - headerAddEntry(cur_package->header, t2, - RPM_STRING_TYPE, scriptProg, 1); - } + } + if (t2) { + addReqProv(cur_package, RPMSENSE_PREREQ, scriptProg, NULL); + headerAddEntry(cur_package->header, t2, + RPM_STRING_TYPE, scriptProg, 1); } return 0; } -- 2.7.4