diff options
Diffstat (limited to 'src/lib/Client/Tools')
-rw-r--r-- | src/lib/Client/Tools/Encap.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/Encap.py b/src/lib/Client/Tools/Encap.py index 102eb0987..24e124103 100644 --- a/src/lib/Client/Tools/Encap.py +++ b/src/lib/Client/Tools/Encap.py @@ -12,9 +12,9 @@ class Encap(Bcfg2.Client.Tools.PkgTool): __req__ = {'Package': ['version', 'url']} pkgtype = 'encap' pkgtool = ("/usr/local/bin/epkg -l -f -q %s", ("%s", ["url"])) - splitter = re.compile('.*/(?P<name>[\w-]+)\-(?P<version>[\w\.-]+)') + splitter = re.compile('.*/(?P<name>[\w-]+)\-(?P<version>[\w\.+-]+)') -# If you define self.pkgtool and self.pkgname it will [use] the Pkgtool.Install +# If you define self.pkgtool and self.pkgname it will [use] the Pkgtool.Install # method will do the installation stuff for you def RefreshPackages(self): @@ -28,7 +28,7 @@ class Encap(Bcfg2.Client.Tools.PkgTool): print "Failed to split name %s" % pkg self.logger.debug("Encap.py: RefreshPackages: self.installed.keys() are:") self.logger.debug("%s" % self.installed.keys()) - + def VerifyPackage(self, entry, _): '''Verify Package status for entry''' if not entry.get('version'): |