diff options
author | mpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-12 01:02:48 +0000 |
---|---|---|
committer | mpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-12 01:02:48 +0000 |
commit | e64e64d55a71865de4a14e8e812e361aae8db5c4 (patch) | |
tree | c50958bc10ff36b3b46f2f0d2254a5d3d89257ee /lib | |
parent | 32bbb3aceee92ae66fe38cc746984a176367de10 (diff) | |
download | puppet-e64e64d55a71865de4a14e8e812e361aae8db5c4.tar.gz puppet-e64e64d55a71865de4a14e8e812e361aae8db5c4.tar.xz puppet-e64e64d55a71865de4a14e8e812e361aae8db5c4.zip |
Make the version string optional in the dpkg-query output parsing regex (Fixes: #425)
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2070 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/puppet/provider/package/dpkg.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb index fbf0d1bf4..eb1911524 100755 --- a/lib/puppet/provider/package/dpkg.rb +++ b/lib/puppet/provider/package/dpkg.rb @@ -14,7 +14,7 @@ Puppet::Type.type(:package).provide :dpkg do Puppet.debug "Executing '%s'" % cmd execpipe(cmd) do |process| # our regex for matching dpkg output - regex = %r{^(\S+ +\S+ +\S+) (\S+) (\S+)$} + regex = %r{^(\S+ +\S+ +\S+) (\S+) (\S*)$} fields = [:status, :name, :ensure] hash = {} @@ -68,7 +68,7 @@ Puppet::Type.type(:package).provide :dpkg do # Our regex for matching dpkg-query output. We could probably just # use split here, but I'm not positive that dpkg-query will never # return whitespace. - regex = %r{^(\S+) (\S+) (\S+) (\S+) (\S+)$} + regex = %r{^(\S+) (\S+) (\S+) (\S+) (\S*)$} line = output.split("\n").shift.chomp |