Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	test/util/posixtest.rb

5 files changed, 7 insertions, 6 deletions

diff --git a/lib/puppet/provider/confine.rb b/lib/puppet/provider/confine.rb
index 35b80fdcf..e15adcd0e 100644
--- a/lib/puppet/provider/confine.rb
+++ b/lib/puppet/provider/confine.rb
@@ -25,7 +25,7 @@ class Puppet::Provider::Confine
             begin
                 require "puppet/provider/confine/%s" % name
             rescue LoadError => detail
-                unless detail.to_s.include?("no such file")
+                unless detail.to_s.include?("No such file")
                     warn "Could not load confine test '%s': %s" % [name, detail]
                 end
                 # Could not find file
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb
index b67cd2b76..ae79f714c 100755
--- a/lib/puppet/provider/package/dpkg.rb
+++ b/lib/puppet/provider/package/dpkg.rb
@@ -121,7 +121,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         end
 
         if hash[:error] != "ok"
-            raise Puppet::PackageError.new(
+            raise Puppet::Error.new(
                 "Package %s, version %s is in error state: %s" %
                     [hash[:name], hash[:ensure], hash[:error]]
             )
diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb
index 99e26ef23..96ef3f042 100755
--- a/lib/puppet/provider/package/ports.rb
+++ b/lib/puppet/provider/package/ports.rb
@@ -33,7 +33,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
         begin
             output = portversion(*cmd)
         rescue Puppet::ExecutionFailure
-            raise Puppet::PackageError.new(output)
+            raise Puppet::Error.new(output)
         end
         line = output.split("\n").pop
 
@@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
         info = $3
 
         unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
-            raise Puppet::PackageError,
+            raise Puppet::Error,
                 "Could not match package info '%s'" % pkgstuff
         end
 
@@ -61,7 +61,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
         # Else, we need to be updated; we need to pull out the new version
 
         unless info =~ /\((\w+) has (.+)\)/
-            raise Puppet::PackageError,
+            raise Puppet::Error,
                 "Could not match version info '%s'" % info
         end
 
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index 3fad8bcfe..d26f76ebd 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -61,6 +61,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
         if @resource[:hasstatus] == :true
               begin 
                   service(@resource[:name], "status")
+                  return :running
               rescue 
                   return :stopped
               end 
diff --git a/lib/puppet/provider/ssh_authorized_key/parsed.rb b/lib/puppet/provider/ssh_authorized_key/parsed.rb
index 3bd22c06b..602e6dd1b 100644
--- a/lib/puppet/provider/ssh_authorized_key/parsed.rb
+++ b/lib/puppet/provider/ssh_authorized_key/parsed.rb
@@ -14,7 +14,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
         :fields   => %w{options type key name},
         :optional => %w{options},
         :rts => /^\s+/,
-        :match    => /^(?:([^ ]+) )?(ssh-dss|ssh-rsa) ([^ ]+)(?: (.+))?$/,
+        :match    => /^(?:(.+) )?(ssh-dss|ssh-rsa) ([^ ]+)(?: (.+))?$/,
         :post_parse => proc { |record|
             if record[:options].nil?
                 record[:options] = [:absent]