summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-05-11 21:23:25 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-05-11 21:23:25 +1000
commitae842ea8214a846624f89711d34f7481d5a8d01a (patch)
tree675f1360dc73ad77fbfd1115e1227c46b25d56a8
parentda4cdd27573a319e8fa5f89642c98377b8911fa4 (diff)
downloadpuppet-ae842ea8214a846624f89711d34f7481d5a8d01a.tar.gz
puppet-ae842ea8214a846624f89711d34f7481d5a8d01a.tar.xz
puppet-ae842ea8214a846624f89711d34f7481d5a8d01a.zip
Fix for urpmi provider that fixes #1217
-rw-r--r--lib/puppet/provider/package/urpmi.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/provider/package/urpmi.rb b/lib/puppet/provider/package/urpmi.rb
index 8adc62ab4..a95835284 100644
--- a/lib/puppet/provider/package/urpmi.rb
+++ b/lib/puppet/provider/package/urpmi.rb
@@ -1,6 +1,6 @@
Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
desc "Support via ``urpmi``."
- commands :urpmi => "urpmi", :rpm => "rpm"
+ commands :urpmi => "urpmi", :urpmq => "urpmq", :rpm => "rpm"
if command('rpm')
confine :true => begin
@@ -41,9 +41,9 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
# What's the latest package version available?
def latest
- output = urpmi "-S", :available, @resource[:name]
+ output = urpmq "-S", @resource[:name]
- if output =~ /^#{@resource[:name]}\S+\s+(\S+)\s/
+ if output =~ /^#{@resource[:name]}\s+:\s+.*\(\s+(\S+)\s+\)/
return $1
else
# urpmi didn't find updates, pretend the current