diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-03-17 14:36:17 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-03-17 14:36:17 -0400 |
| commit | b90963b68dcf46031f0aed4280218c2aea5cdb68 (patch) | |
| tree | 7b9cea5faeb1e55d725f01b15c2517a41e8ad79d | |
| parent | 1c11a83d5ee3a5369aa5cedc7df64db5e558ef1d (diff) | |
| download | bcfg2-b90963b68dcf46031f0aed4280218c2aea5cdb68.tar.gz bcfg2-b90963b68dcf46031f0aed4280218c2aea5cdb68.tar.bz2 bcfg2-b90963b68dcf46031f0aed4280218c2aea5cdb68.zip | |
Add error checking to make sure gpg-pubkeys have all needed information
Conflicts:
src/lib/Client/Tools/YUMng.py
Cherry-picked from 81fce09fb9671c652703c37a5f9b48d020a34307
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index 009c9a3a1..12aad2c0e 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -448,8 +448,16 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): self.logger.debug(" Not checking version for virtual package") _POs = [ po for po in POs ] # Make a copy elif entry.get('name') == 'gpg-pubkey': - _POs = [ p for p in POs if p.version == nevra['version'] \ - and p.release == nevra['release'] ] + if 'version' not in nevra: + m = "Skipping verify: gpg-pubkey without an RPM version." + self.logger.warning(m) + continue + if 'release' not in nevra: + m = "Skipping verify: gpg-pubkey without an RPM release." + self.logger.warning(m) + continue + _POs = [p for p in POs if p.version == nevra['version'] \ + and p.release == nevra['release']] else: _POs = self.yb.rpmdb.searchNevra(**snevra) if len(_POs) == 0: |