From 47571d8adfd2014da9ba84458b654f8bd0882141 Mon Sep 17 00:00:00 2001 From: marc Date: Mon, 20 Apr 1998 01:15:41 +0000 Subject: [PATCH] Missed some unlinks() when scripts failed CVS patchset: 2094 CVS date: 1998/04/20 01:15:41 --- CHANGES | 1 + build/build.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 07a7fb2..48cdcae 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,7 @@ - dep ordering returns w/ an error as soon as a prereq loop is found - autoreqprov flag was being ignored during builds - add autoreq: and autoprov: + - missed a few unlink() when scripts failed 2.4.108 -> 2.4.109: - remove icons with --rmsource diff --git a/build/build.c b/build/build.c index c97225d..447d88a 100644 --- a/build/build.c +++ b/build/build.c @@ -142,6 +142,7 @@ int doScript(Spec spec, int what, char *name, StringBuf sb, int test) if (writeVars(spec, f)) { fclose(f); + unlink(scriptName); FREE(scriptName); return RPMERR_SCRIPT; } @@ -177,6 +178,7 @@ int doScript(Spec spec, int what, char *name, StringBuf sb, int test) execl(buildShell, buildShell, "-e", scriptName, scriptName, NULL); rpmError(RPMERR_SCRIPT, "Exec of %s failed (%s)", scriptName, name); + unlink(scriptName); FREE(scriptName); return RPMERR_SCRIPT; } @@ -184,6 +186,7 @@ int doScript(Spec spec, int what, char *name, StringBuf sb, int test) if (! WIFEXITED(status) || WEXITSTATUS(status)) { rpmError(RPMERR_SCRIPT, "Bad exit status from %s (%s)", scriptName, name); + unlink(scriptName); FREE(scriptName); return RPMERR_SCRIPT; } -- 2.7.4