From 6bc766ded7ee1beb94fba553fba77bd9bde79e48 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 26 Sep 2012 16:33:28 -0400 Subject: fixed bug with Remove and FindExtra in package tools --- src/lib/Bcfg2/Client/Tools/__init__.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index 8f1d277d8..4022692be 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -228,18 +228,17 @@ class Tool(object): class PkgTool(Tool): - """ - PkgTool provides a one-pass install with - fallback for use with packaging systems - """ + """ PkgTool provides a one-pass install with fallback for use with + packaging systems """ pkgtool = ('echo %s', ('%s', ['name'])) pkgtype = 'echo' - name = 'PkgTool' def __init__(self, logger, setup, config): Tool.__init__(self, logger, setup, config) self.installed = {} self.RefreshPackages() + self.Remove = self.RemovePackages # pylint: disable=C0103 + self.FindExtra = self.FindExtraPackages # pylint: disable=C0103 def VerifyPackage(self, dummy, _): """Dummy verification method""" @@ -309,19 +308,15 @@ class PkgTool(Tool): def FindExtraPackages(self): """Find extra packages.""" packages = [entry.get('name') for entry in self.getSupportedEntries()] - extras = [data for data in list(self.installed.items()) \ + extras = [data for data in list(self.installed.items()) if data[0] not in packages] - return [Bcfg2.Client.XML.Element('Package', name=name, \ - type=self.pkgtype, version=version) \ - for (name, version) in extras] - - Remove = RemovePackages - FindExtra = FindExtraPackages + return [Bcfg2.Client.XML.Element('Package', name=name, + type=self.pkgtype, version=version) + for (name, version) in extras] class SvcTool(Tool): """This class defines basic Service behavior""" - name = 'SvcTool' def __init__(self, logger, setup, config): Tool.__init__(self, logger, setup, config) -- cgit v1.2.3-1-g7c22