- *_terminate_build macros set per-pkg, not per-invocation (#161081).

CVS patchset: 7875
CVS date: 2005/07/13 10:03:31

2 files changed, 5 insertions, 15 deletions

diff --git a/CHANGES b/CHANGES
index 800a2e6f5..1db53f9bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@
 	- added brp-java-gcjcompile build helper.
 	- fix: java compiled with -O0 confuses debugedit (#161722).
 	- fix: % at end-of-line overflow (#161091).
+	- *_terminate_build macros set per-pkg, not per-invocation (#161081).
 
 4.4 -> 4.4.1:
 	- force *.py->*.pyo byte code compilation with brp-python-bytecompile.
diff --git a/build/files.c b/build/files.c
index bfd4ef1a7..b91cedccb 100644
--- a/build/files.c
+++ b/build/files.c
@@ -2110,15 +2110,10 @@ static int processPackageFiles(Spec spec, Package pkg,
     /* Now process special doc, if there is one */
     if (specialDoc) {
 	if (installSpecialDoc) {
-	    static int _missing_doc_files_terminate_build = 0;
-	    static int oneshot = 0;
+	    int _missing_doc_files_terminate_build =
+		    rpmExpandNumeric("%{?_missing_doc_files_terminate_build}");
 	    int rc;
 
-	    if (!oneshot) {
-	        _missing_doc_files_terminate_build =
-		    rpmExpandNumeric("%{?_missing_doc_files_terminate_build}");
-		oneshot = 1;
-	    }
 	    rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
 	    if (rc && _missing_doc_files_terminate_build)
 		fl.processingFailed = rc;
@@ -2424,16 +2419,10 @@ static int checkFiles(StringBuf fileList)
 	goto exit;
     
     if (sb_stdout) {
-	static int _unpackaged_files_terminate_build = 0;
-	static int oneshot = 0;
+	int _unpackaged_files_terminate_build =
+		rpmExpandNumeric("%{?_unpackaged_files_terminate_build}");
 	const char * t;
 
-	if (!oneshot) {
-	    _unpackaged_files_terminate_build =
-		rpmExpandNumeric("%{?_unpackaged_files_terminate_build}");
-	    oneshot = 1;
-	}
-	
 	t = getStringBuf(sb_stdout);
 	if ((*t != '\0') && (*t != '\n')) {
 	    rc = (_unpackaged_files_terminate_build) ? 1 : 0;