[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Dominic Cleal]

The following commit has been merged in the experimental branch:
commit cb552af357763310ca4a16bf514dd39fcbd203bf
Author: Dominic Cleal <dcleal at redhat.com>
Date:   Wed Apr 13 13:10:40 2011 +0100

    (#4258) Remove superfluous command check that called pkgutil

diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb
index ab8a507..a1d844f 100755
--- a/lib/puppet/provider/package/pkgutil.rb
+++ b/lib/puppet/provider/package/pkgutil.rb
@@ -1,21 +1,17 @@
 # Packaging using Peter Bonivart's pkgutil program.
 Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do
   desc "Package management using Peter Bonivart's ``pkgutil`` command on Solaris."
-  pkguti = "pkgutil"
+
+  pkgutil_bin = "pkgutil"
   if FileTest.executable?("/opt/csw/bin/pkgutil")
-    pkguti = "/opt/csw/bin/pkgutil"
+    pkgutil_bin = "/opt/csw/bin/pkgutil"
   end
 
   confine :operatingsystem => :solaris
 
-  commands :pkguti => pkguti
+  commands :pkguti => pkgutil_bin
 
   def self.healthcheck()
-    if pkguti == "pkgutil"
-      raise Puppet::Error,
-        "The pkgutil command is missing; pkgutil packaging unavailable"
-    end
-
     unless FileTest.exists?("/var/opt/csw/pkgutil/admin")
       Puppet.notice "It is highly recommended you create '/var/opt/csw/pkgutil/admin'."
       Puppet.notice "See /var/opt/csw/pkgutil"

-- 
Puppet packaging for Debian