Small bug fixes

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1174 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/puppet/type/package/openbsd.rb b/lib/puppet/type/package/openbsd.rb
index 4e4070ebc..9feaa2feb 100755
--- a/lib/puppet/type/package/openbsd.rb
+++ b/lib/puppet/type/package/openbsd.rb
@@ -56,7 +56,7 @@ module Puppet
             # list out all of the packages
             open("| #{listcmd()}") { |process|
                 # our regex for matching dpkg output
-                regex = %r{^(\S+)-(\d\S+)\s+(.+)}
+                regex = %r{^(\S+)-(\d\S*)\s+(.+)}
                 fields = [:name, :version, :description]
                 hash = {}
 
@@ -83,7 +83,7 @@ module Puppet
                         packages << pkg
                     else
                         raise Puppet::DevError,
-                            "Failed to match dpkg line %s" % line
+                            "Failed to match line %s" % line
                     end
                 }
             }
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index 9d866c60d..fffae4ebe 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -456,6 +456,7 @@ module Puppet
                 )
             end
             regex = Regexp.new(self[:pattern])
+            self.debug "Executing '#{ps}'"
             IO.popen(ps) { |table|
                 table.each { |line|
                     if regex.match(line)