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/pack.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/pack.c')
-rw-r--r-- | build/pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/pack.c b/build/pack.c index 8e0c8685c..fa4b4efa9 100644 --- a/build/pack.c +++ b/build/pack.c @@ -668,7 +668,7 @@ static rpmRC checkPackages(char *pkgcheck) return RPMRC_OK; } -rpmRC packageBinaries(rpmSpec spec, const char *cookie) +rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) { struct cpioSourceArchive_s csabuf; CSA_t csa = &csabuf; @@ -705,7 +705,7 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie) headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); } - if (rpmBTArgs.shortCircuit) { + if (cheating) { (void) rpmlibNeedsFeature(pkg->header, "ShortCircuited", "4.9.0-1"); } |