diff options
author | Sol Jerome <solj@ices.utexas.edu> | 2009-02-11 20:33:08 +0000 |
---|---|---|
committer | Sol Jerome <solj@ices.utexas.edu> | 2009-02-11 20:33:08 +0000 |
commit | 668ecd8345aa2943187df23c1130c1dceaa564b1 (patch) | |
tree | bb1945418fdece1dd9c851f072c23c71ebcd6b5d /src/lib | |
parent | b3c4bc67a0ea6580291d9d7adf36e17f31731280 (diff) | |
download | bcfg2-668ecd8345aa2943187df23c1130c1dceaa564b1.tar.gz bcfg2-668ecd8345aa2943187df23c1130c1dceaa564b1.tar.bz2 bcfg2-668ecd8345aa2943187df23c1130c1dceaa564b1.zip |
Fix gpg nosignature option (Ticket #641)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5074 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Client/Tools/RPMng.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py index 27bae2552..6dca8e142 100644 --- a/src/lib/Client/Tools/RPMng.py +++ b/src/lib/Client/Tools/RPMng.py @@ -279,7 +279,8 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): if self.pkg_verify == 'true' and \ inst.get('pkg_verify', 'true') == 'true': flags = inst.get('verify_flags', '').split(',') + self.verify_flags - if pkg.get('gpgkeyid', '')[-8:] not in self.gpg_keyids: + if pkg.get('gpgkeyid', '')[-8:] not in self.gpg_keyids and \ + 'nosignature' not in flags: flags += ['nosignature', 'nodigest'] self.logger.info('WARNING: Package %s %s requires GPG Public key with ID %s'\ % (pkg.get('name'), self.str_evra(pkg), \ |