diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-09-02 12:52:56 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-09-02 13:04:08 +0300 |
| commit | 746012eb74d8a93ab78ee39884fad05b1eed5f9f (patch) | |
| tree | 73e85a8cc2491b8e80bef98c78e2c561772da9f8 /rpmbuild.c | |
| parent | 6b0d371f4a73cadac129796b25f03a35a0533132 (diff) | |
| download | rpm-746012eb74d8a93ab78ee39884fad05b1eed5f9f.tar.gz rpm-746012eb74d8a93ab78ee39884fad05b1eed5f9f.tar.bz2 rpm-746012eb74d8a93ab78ee39884fad05b1eed5f9f.zip | |
Eliminate verify flags from rpmBuildArguments
- Transaction set verification bits are not relevant to building,
bury inside the rpmbuild cli utility.
- Also the type was wrong, its rpmVerifyFlags, not rpmQueryFlags, duh
Diffstat (limited to 'rpmbuild.c')
| -rw-r--r-- | rpmbuild.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/rpmbuild.c b/rpmbuild.c index f0b22b4b8..94021e855 100644 --- a/rpmbuild.c +++ b/rpmbuild.c @@ -48,6 +48,7 @@ static struct rpmBuildArguments_s rpmBTArgs; extern int _fsm_debug; +static rpmVerifyFlags qva_flags = 0; /*!< Bit(s) to control verification */ static int noDeps = 0; /*!< from --nodeps */ static int shortCircuit = 0; /*!< from --short-circuit */ @@ -101,15 +102,15 @@ static void buildArgCallback( poptContext con, break; case RPMCLI_POPT_NODIGEST: - rba->qva_flags |= VERIFY_DIGEST; + qva_flags |= VERIFY_DIGEST; break; case RPMCLI_POPT_NOSIGNATURE: - rba->qva_flags |= VERIFY_SIGNATURE; + qva_flags |= VERIFY_SIGNATURE; break; case RPMCLI_POPT_NOHDRCHK: - rba->qva_flags |= VERIFY_HDRCHK; + qva_flags |= VERIFY_HDRCHK; break; case RPMCLI_POPT_FORCE: @@ -505,11 +506,11 @@ static int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile) rpmVSFlags vsflags, ovsflags; vsflags = rpmExpandNumeric("%{_vsflags_build}"); - if (ba->qva_flags & VERIFY_DIGEST) + if (qva_flags & VERIFY_DIGEST) vsflags |= _RPMVSF_NODIGESTS; - if (ba->qva_flags & VERIFY_SIGNATURE) + if (qva_flags & VERIFY_SIGNATURE) vsflags |= _RPMVSF_NOSIGNATURES; - if (ba->qva_flags & VERIFY_HDRCHK) + if (qva_flags & VERIFY_HDRCHK) vsflags |= RPMVSF_NOHDRCHK; ovsflags = rpmtsSetVSFlags(ts, vsflags); |