diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2010-09-02 11:01:15 +0300 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2010-09-02 11:16:07 +0300 |
commit | 3c7d4f89bb68d68b9d775fc6623c3f1c342ac0bd (patch) | |
tree | 8794558aea95c03c4d8e56de5963191b43e5a8b7 /build/build.c | |
parent | 36f0c779d6770f5b3c8bdc72a562a4f7880ed4b7 (diff) | |
download | rpm-3c7d4f89bb68d68b9d775fc6623c3f1c342ac0bd.tar.gz rpm-3c7d4f89bb68d68b9d775fc6623c3f1c342ac0bd.tar.bz2 rpm-3c7d4f89bb68d68b9d775fc6623c3f1c342ac0bd.zip |
Detect short-circuited build based on executed build steps from buildSpec()
- Avoids having to access rpmBTArgs from deep packageBinaries(),
API changing is not an issue anymore...
Diffstat (limited to 'build/build.c')
-rw-r--r-- | build/build.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/build.c b/build/build.c index 0584dcf3f..cab152bd1 100644 --- a/build/build.c +++ b/build/build.c @@ -234,6 +234,8 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what) } } } else { + int didBuild = (what & (RPMBUILD_PREP|RPMBUILD_BUILD|RPMBUILD_INSTALL)); + if ((what & RPMBUILD_PREP) && (rc = doScript(spec, RPMBUILD_PREP, NULL, NULL, test))) goto exit; @@ -268,7 +270,7 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what) return rc; if (((what & RPMBUILD_PACKAGEBINARY) && !test) && - (rc = packageBinaries(spec, cookie))) + (rc = packageBinaries(spec, cookie, (didBuild == 0)))) goto exit; if ((what & RPMBUILD_CLEAN) && |