diff options
Diffstat (limited to 'src/lib/Bcfg2')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/HomeBrew.py | 54 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/FileMonitor/Pseudo.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Decisions.py | 6 |
3 files changed, 60 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/HomeBrew.py b/src/lib/Bcfg2/Client/Tools/HomeBrew.py new file mode 100644 index 000000000..d2f251230 --- /dev/null +++ b/src/lib/Bcfg2/Client/Tools/HomeBrew.py @@ -0,0 +1,54 @@ +"""This provides Bcfg2 support for homebrew packages.""" + +import Bcfg2.Client.Tools + + +class HomeBrew(Bcfg2.Client.Tools.PkgTool): + """Homebrew package support.""" + name = 'HomeBrew' + __execs__ = ["/usr/local/bin/brew"] + __handles__ = [('Package', 'homebrew')] + __req__ = {'Package': ['name', 'version']} + pkgtype = 'homebrew' + pkgtool = ('/usr/local/bin/brew install %s', ('%s', ['name'])) + + def RefreshPackages(self): + """Refresh memory hashes of packages.""" + pkgcache = self.cmd.run(["/usr/local/bin/brew", + "list", "--versions"]).stdout.splitlines() + self.installed = {} + for pkg in pkgcache: + pkgname, version = pkg.strip().split() + self.logger.debug(" pkgname: %s version: %s" % (pkgname, version)) + self.installed[pkgname] = version + + def VerifyPackage(self, entry, _): + """Verify Package status for entry.""" + self.logger.debug("VerifyPackage: %s : %s" % (entry.get('name'), + entry.get('version'))) + + if entry.attrib['name'] in self.installed: + if (self.installed[entry.attrib['name']] == + entry.attrib['version'] or + entry.attrib['version'] == 'any'): + 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') + return False + + def Remove(self, packages): + """Remove extra packages.""" + pkg_names = [p.get('name') for p in packages] + self.logger.info("Removing packages: %s" % pkg_names) + self.cmd.run(["/usr/local/bin/brew", "uninstall"] + pkg_names) + self.RefreshPackages() + self.extra = self.FindExtra() diff --git a/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py b/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py index b1e1adab7..9781e5b75 100644 --- a/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py +++ b/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py @@ -17,7 +17,8 @@ class Pseudo(FileMonitor): def AddMonitor(self, path, obj, handleID=None): if handleID is None: handleID = len(list(self.handles.keys())) - self.events.append(Event(handleID, path, 'exists')) + if os.path.exists(path): + self.events.append(Event(handleID, path, 'exists')) if os.path.isdir(path): dirlist = os.listdir(path) for fname in dirlist: diff --git a/src/lib/Bcfg2/Server/Plugins/Decisions.py b/src/lib/Bcfg2/Server/Plugins/Decisions.py index b30a9acea..957426ec8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Decisions.py +++ b/src/lib/Bcfg2/Server/Plugins/Decisions.py @@ -27,8 +27,10 @@ class Decisions(Bcfg2.Server.Plugin.Plugin, def __init__(self, core): Bcfg2.Server.Plugin.Plugin.__init__(self, core) Bcfg2.Server.Plugin.Decision.__init__(self) - self.whitelist = DecisionFile(os.path.join(self.data, "whitelist.xml")) - self.blacklist = DecisionFile(os.path.join(self.data, "blacklist.xml")) + self.whitelist = DecisionFile(os.path.join(self.data, "whitelist.xml"), + should_monitor=True) + self.blacklist = DecisionFile(os.path.join(self.data, "blacklist.xml"), + should_monitor=True) def GetDecisions(self, metadata, mode): return getattr(self, mode).get_decisions(metadata) |