summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2005-09-13 15:46:04 +0000
committerNarayan Desai <desai@mcs.anl.gov>2005-09-13 15:46:04 +0000
commit0877f2e2e4452d1bb1cc9dc3c99d601e184930db (patch)
tree022806e11c0e82e5cc3a0cd98c08635ae7899275 /src
parentfd96560ff74867e40c1b86d2b64b2c523a62b694 (diff)
downloadbcfg2-0877f2e2e4452d1bb1cc9dc3c99d601e184930db.tar.gz
bcfg2-0877f2e2e4452d1bb1cc9dc3c99d601e184930db.tar.bz2
bcfg2-0877f2e2e4452d1bb1cc9dc3c99d601e184930db.zip
fix multi-tool code
(Logical change 1.306) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1253 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Toolset.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py
index 7d7715eda..a28172c89 100644
--- a/src/lib/Client/Toolset.py
+++ b/src/lib/Client/Toolset.py
@@ -506,10 +506,11 @@ class Toolset(object):
self.CondPrint("verbose", "No support for pkgtype %s" % (pkgtype))
continue
pkgtool = self.pkgtool[pkgtype]
- pkglist = " ".join([pkgtool[1][0] % tuple([pkg.get(field, '') for field in pkgtool[1][1]])
- for pkg in packages if pkg.get('type') == pkgtype])
- self.CondPrint("debug", "Installing packages: %s" % pkglist)
- cmdrc = system(pkgtool[0] % pkglist)
+ pkglist = [pkg for pkg in packages if pkg.get('type') == pkgtype]
+ pkgargs = " ".join([pkgtool[1][0] % tuple([pkg.get(field, '') for field in pkgtool[1][1]])
+ for pkg in pkglist]
+ self.CondPrint("debug", "Installing packages: %s" % pkgargs)
+ cmdrc = system(pkgtool[0] % pkgargs)
if cmdrc == 0:
self.CondPrint('verbose', "Single Pass Succeded")