diff options
| author | Luke Cyca <me@lukecyca.com> | 2012-04-16 14:43:15 -0700 |
|---|---|---|
| committer | Luke Cyca <me@lukecyca.com> | 2012-04-16 14:43:15 -0700 |
| commit | 74be9f46696308e05b6097c7968043a90df06de4 (patch) | |
| tree | 7f99d489325d2fd1786da3f05f8adf8c473e2438 /src | |
| parent | 0ec333243a90cce12f12397dd95ed13a89d36ea0 (diff) | |
| download | bcfg2-74be9f46696308e05b6097c7968043a90df06de4.tar.gz bcfg2-74be9f46696308e05b6097c7968043a90df06de4.tar.bz2 bcfg2-74be9f46696308e05b6097c7968043a90df06de4.zip | |
Fixed launchd to correctly parse label from plist, and added a warning when it can't be parsed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Client/Tools/launchd.py | 7 |
1 files 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) |