From 0ec333243a90cce12f12397dd95ed13a89d36ea0 Mon Sep 17 00:00:00 2001 From: Luke Cyca Date: Mon, 16 Apr 2012 14:39:38 -0700 Subject: MacPorts now respects version="any" and logs version mismatches like other plugins. --- src/lib/Client/Tools/MacPorts.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/Client/Tools/MacPorts.py b/src/lib/Client/Tools/MacPorts.py index e84d3e553..2a7ba9eb9 100644 --- a/src/lib/Client/Tools/MacPorts.py +++ b/src/lib/Client/Tools/MacPorts.py @@ -38,13 +38,20 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool): return False if entry.attrib['name'] in self.installed: - if self.installed[entry.attrib['name']] == entry.attrib['version']: + if (self.installed[entry.attrib['name']] == entry.attrib['version'] or + entry.attrib['version'] == 'any'): #if not self.setup['quick'] and \ # entry.get('verify', 'true') == 'true': #FIXME: We should be able to check this once # http://trac.macports.org/ticket/15709 is implemented return True else: + self.logger.info(" %s: Wrong version installed. " + "Want %s, but have %s" % (entry.get("name"), + entry.get("version"), + self.installed[entry.get("name")], + )) + entry.set('current_version', self.installed[entry.get('name')]) return False entry.set('current_exists', 'false') -- cgit v1.2.3-1-g7c22 From 74be9f46696308e05b6097c7968043a90df06de4 Mon Sep 17 00:00:00 2001 From: Luke Cyca Date: Mon, 16 Apr 2012 14:43:15 -0700 Subject: Fixed launchd to correctly parse label from plist, and added a warning when it can't be parsed. --- src/lib/Client/Tools/launchd.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/Client/Tools/launchd.py b/src/lib/Client/Tools/launchd.py index e70d7d83e..d7cbfa07f 100644 --- a/src/lib/Client/Tools/launchd.py +++ b/src/lib/Client/Tools/launchd.py @@ -37,10 +37,11 @@ class launchd(Bcfg2.Client.Tools.Tool): else: d = daemon label = self.cmd.run('defaults read %s/%s Label' % - (directory, d))[1] + (directory, d))[1][0] self.plistMapping[label] = "%s/%s" % (directory, daemon) - except KeyError: # perhaps this could be more robust - pass + except KeyError: + self.logger.warning("Could not get label from %s/%s" % + (directory, daemon)) def FindPlist(self, entry): return self.plistMapping.get(entry.get('name'), None) -- cgit v1.2.3-1-g7c22