diff options
| author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-07-19 02:10:32 +0000 |
|---|---|---|
| committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-07-19 02:10:32 +0000 |
| commit | fbbd7f65a1e6da56b0a1da12be59a1887e310a42 (patch) | |
| tree | e3b845a143bf3090554c0765282746b71073a520 /src/lib/Client/Tools/Encap.py | |
| parent | fd787917bdcd0aaf5f5b0b99dfa5e2a992d734a4 (diff) | |
| download | bcfg2-fbbd7f65a1e6da56b0a1da12be59a1887e310a42.tar.gz bcfg2-fbbd7f65a1e6da56b0a1da12be59a1887e310a42.tar.bz2 bcfg2-fbbd7f65a1e6da56b0a1da12be59a1887e310a42.zip | |
Change encap splitting regular expressions to allow package names with dashes and version names with pluses. Should solve ticket #467 (except for the not complaining about epkg.log thing, but that seems harmless). http://kodos.sourceforge.net/ is your friend.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3482 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client/Tools/Encap.py')
| -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'): |