From 3fa20dd696bf480ef11d59f3cabff2afed48c41a Mon Sep 17 00:00:00 2001 From: Luke Cyca Date: Wed, 10 Oct 2012 10:45:18 -0700 Subject: Ignore non-package lines in macports output --- src/lib/Bcfg2/Client/Tools/MacPorts.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/lib') 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)) -- cgit v1.2.3-1-g7c22