Merge commit 'turnbull/0.24.x' into 0.24.x

2 files changed, 4 insertions, 4 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
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index d27406d6d..0e6f91e48 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -122,7 +122,7 @@ class Puppet::Util::Settings
             if pval = self.value(varname)
                 pval
             else
-                raise Puppet::DevError, "Could not find value for %s" % parent
+                raise Puppet::DevError, "Could not find value for %s" % value
             end
         end