From 4acb8866ef8b232b736b84a68b2701070439a6f4 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 1 Sep 2010 14:00:54 +0300 Subject: Eliminate cookie from spec structure - Cookies are not a property of spec but a given build, handle this internally to buildSpec() except for --rebuild which passes the srpm identifier cookie through buildArgs --- build/parseSpec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'build/parseSpec.c') diff --git a/build/parseSpec.c b/build/parseSpec.c index 38ba5e206..9e2b0ef45 100644 --- a/build/parseSpec.c +++ b/build/parseSpec.c @@ -546,8 +546,6 @@ int parseSpec(rpmts ts, const char *specFile, const char *rootDir, if (rootDir) spec->rootDir = xstrdup(rootDir); - if (cookie) - spec->cookie = xstrdup(cookie); spec->timeCheck = rpmExpandNumeric("%{_timecheck}"); @@ -635,7 +633,7 @@ int parseSpec(rpmts ts, const char *specFile, const char *rootDir, addMacro(NULL, "_target_cpu", NULL, spec->BANames[x], RMIL_RPMRC); spec->BASpecs[index] = NULL; if (parseSpec(ts, specFile, spec->rootDir, buildRoot, 1, - NULL, cookie, anyarch, force) + NULL, NULL, anyarch, force) || (spec->BASpecs[index] = rpmtsSetSpec(ts, NULL)) == NULL) { spec->BACount = index; -- cgit v1.2.3