summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-04-13 18:22:51 -0700
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-04-13 18:22:51 -0700
commit3be82d87b4463d0f421d65de08d9377e178a0ff0 (patch)
treee961ccc88d9f1f6e0bbbeec808388abbccca79c5
parenta073cda4fe1ed93d8f9cc5c3680113a8c4610938 (diff)
parente6d9984baf3fc9788ac82ba75e4ea17d38d80b42 (diff)
downloadbcfg2-3be82d87b4463d0f421d65de08d9377e178a0ff0.tar.gz
bcfg2-3be82d87b4463d0f421d65de08d9377e178a0ff0.tar.bz2
bcfg2-3be82d87b4463d0f421d65de08d9377e178a0ff0.zip
Merge pull request #23 from lukecyca/patch-1
Fixes to Client.Tools.MacPorts
-rw-r--r--src/lib/Client/Tools/MacPorts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/MacPorts.py b/src/lib/Client/Tools/MacPorts.py
index 23b536451..e84d3e553 100644
--- a/src/lib/Client/Tools/MacPorts.py
+++ b/src/lib/Client/Tools/MacPorts.py
@@ -11,7 +11,7 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
__handles__ = [('Package', 'macport')]
__req__ = {'Package': ['name', 'version']}
pkgtype = 'macport'
- pkgtool = ("/opt/local/bin/port install %s")
+ pkgtool = ('/opt/local/bin/port install %s', ('%s', ['name']))
def __init__(self, logger, setup, config):
Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
@@ -27,7 +27,7 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
continue
pkgname = pkg.split('@')[0].strip()
version = pkg.split('@')[1].split(' ')[0]
- self.logger.info(" pkgname: %s\n version: %s" % (pkgname, version))
+ self.logger.info(" pkgname: %s version: %s" % (pkgname, version))
self.installed[pkgname] = version
def VerifyPackage(self, entry, modlist):