diff options
| author | Luke Cyca <me@lukecyca.com> | 2012-10-10 10:45:18 -0700 |
|---|---|---|
| committer | Luke Cyca <me@lukecyca.com> | 2012-10-10 10:45:18 -0700 |
| commit | 3fa20dd696bf480ef11d59f3cabff2afed48c41a (patch) | |
| tree | 54a8b8239c6f0ad6f66b0ea35d4d1de42e16f158 /src/lib/Bcfg2/Client/Tools/MacPorts.py | |
| parent | fa7d8199a8d6b68fbef6a79d36045335bd3f787b (diff) | |
| download | bcfg2-3fa20dd696bf480ef11d59f3cabff2afed48c41a.tar.gz bcfg2-3fa20dd696bf480ef11d59f3cabff2afed48c41a.tar.bz2 bcfg2-3fa20dd696bf480ef11d59f3cabff2afed48c41a.zip | |
Ignore non-package lines in macports output
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/MacPorts.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/MacPorts.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py index d768019a9..22f06ce9a 100644 --- a/src/lib/Bcfg2/Client/Tools/MacPorts.py +++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py @@ -22,8 +22,12 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool): pkgcache = self.cmd.run("/opt/local/bin/port installed")[1] self.installed = {} for pkg in pkgcache: + if pkg.startswith("Warning:"): + continue if pkg.startswith("The following ports are currently installed"): continue + if pkg.startswith("No ports are installed"): + return pkgname = pkg.split('@')[0].strip() version = pkg.split('@')[1].split(' ')[0] self.logger.info(" pkgname: %s version: %s" % (pkgname, version)) |