summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jinks <mjinks@uchicago.edu>2009-01-31 04:03:55 +0000
committerMichael Jinks <mjinks@uchicago.edu>2009-01-31 04:03:55 +0000
commit37f6b4fad26d66e41df55a9531ed73a89a7524ae (patch)
treebe1c7977aa300438be74ad7273c6d92101c20af8
parent039d7fa675dd487219f7f67ff34b2f9b33e9c1a8 (diff)
downloadbcfg2-37f6b4fad26d66e41df55a9531ed73a89a7524ae.tar.gz
bcfg2-37f6b4fad26d66e41df55a9531ed73a89a7524ae.tar.bz2
bcfg2-37f6b4fad26d66e41df55a9531ed73a89a7524ae.zip
M Tools/Portage.py
VerifyPackages had a bug in the call to 'equery check' such that it never should have worked at all when the client was called without -q. Fixed it to add a version to the package name. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5053 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Client/Tools/Portage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/Portage.py b/src/lib/Client/Tools/Portage.py
index 936dc25cb..8f7875839 100644
--- a/src/lib/Client/Tools/Portage.py
+++ b/src/lib/Client/Tools/Portage.py
@@ -44,8 +44,8 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
if not self.setup['quick'] and \
entry.get('verify', 'true') == 'true':
output = self.cmd.run \
- ("/usr/bin/equery check =%s 2>&1 |grep '!!!' \
- | awk '{print $2}'" % entry.get('name'))[1]
+ ("/usr/bin/equery check '=%s-%s' 2>&1 |grep '!!!' | awk '{print $2}'" \
+ % (entry.get('name'), entry.get('version')))[1]
if [filename for filename in output \
if filename not in modlist]:
return False