diff options
| author | Markus Roberts <Markus@reality.com> | 2009-12-11 08:23:07 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-12 21:17:14 +1100 |
| commit | bf7d650a65bc4b97ac72ddf38647766229b3182e (patch) | |
| tree | 183c8104dfc271412d6eb5023a7c9d3921867664 /lib | |
| parent | cccbca4e540db85e49428cae2c78390bfcdbf4a0 (diff) | |
| download | puppet-bf7d650a65bc4b97ac72ddf38647766229b3182e.tar.gz puppet-bf7d650a65bc4b97ac72ddf38647766229b3182e.tar.xz puppet-bf7d650a65bc4b97ac72ddf38647766229b3182e.zip | |
Fix for #2900 (rug output parsing too specific)
Andrew Forgue's suggested patch; changes the regular expression to
accept any non-space characters, non-vertical bar characters in a
version "number".
Examples
v | SLES10-SP1-Updates | | resmgr | 0.9.8_SVNr75-18.9 | x86_64
v | SLES10-SP1-Updates | | wireless-tools | 28pre13-22.16.2 | x86_64
Signed-off-by: Markus Roberts <Markus@reality.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/package/rug.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/package/rug.rb b/lib/puppet/provider/package/rug.rb index ca27cbbd3..9f09b35fe 100644 --- a/lib/puppet/provider/package/rug.rb +++ b/lib/puppet/provider/package/rug.rb @@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do #rug can only get a list of *all* available packages? output = rug "list-updates" - if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([0-9\.\-]+)/ + if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s\|]+)/ return $1 else # rug didn't find updates, pretend the current |