Please review pull request #558: fix of self::REGEX and version(in def latest) to support extra pkg repositories (e.g. sfe) opened by (InViZz)
Description:
using extra repos like sfe will give one additional field in the pkg
output:
#pkg list -H | grep geoip
library/geoip (see) 1.4.6-0.151.1 installed
this commit fixes this problem
- Opened: Sat Mar 03 10:27:50 UTC 2012
- Based on: puppetlabs:master (372c3982888d9048be0a08921e39c81dab3a5dec)
- Requested merge: InViZz:master (9b96b8d3f75239a53c1b076077fd28d470338b13)
Diff follows:
diff --git a/lib/puppet/provider/package/pkg.rb b/lib/puppet/provider/package/pkg.rb
index 0b826e8..d9630e8 100644
--- a/lib/puppet/provider/package/pkg.rb
+++ b/lib/puppet/provider/package/pkg.rb
@@ -27,7 +27,7 @@ def self.instances
packages
end
- self::REGEX = %r{^(\S+)\s+(\S+)\s+(\S+)\s+}
+ self::REGEX = %r{^(\S+)\s+(?:\(.+\)\s+)?(\S+)\s+(\S+)\s+}
self::FIELDS = [:name, :version, :status]
def self.parse_line(line)
@@ -59,7 +59,7 @@ def self.parse_line(line)
def latest
version = nil
pkg(:list, "-Ha", @resource[:name]).split("\n").each do |line|
- v = line.split[2]
+ v = line.split[-2]
case v
when "known"
return v
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
