From 746012eb74d8a93ab78ee39884fad05b1eed5f9f Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 2 Sep 2010 12:52:56 +0300 Subject: [PATCH] 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 --- build/rpmbuild.h | 1 - rpmbuild.c | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/rpmbuild.h b/build/rpmbuild.h index 91ac329..866e0ec 100644 --- a/build/rpmbuild.h +++ b/build/rpmbuild.h @@ -47,7 +47,6 @@ typedef enum rpmBuildPkgFlags_e { * Describe build command line request. */ struct rpmBuildArguments_s { - rpmQueryFlags qva_flags; /*!< Bit(s) to control verification. */ rpmSpecFlags specFlags; /*!< Bit(s) to control spec parsing. */ rpmBuildPkgFlags pkgFlags; /*!< Bit(s) to control package generation. */ int buildAmount; /*!< Bit(s) to control operation. */ diff --git a/rpmbuild.c b/rpmbuild.c index f0b22b4..94021e8 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); -- 2.7.4