diff options
| author | Dominic Cleal <dcleal@redhat.com> | 2011-04-13 13:10:40 +0100 |
|---|---|---|
| committer | Dominic Cleal <dcleal@redhat.com> | 2011-04-13 13:10:40 +0100 |
| commit | cb552af357763310ca4a16bf514dd39fcbd203bf (patch) | |
| tree | bfd8bc58313f5335877b795de6ef105595bf1ffb /lib/puppet | |
| parent | fd983410d841fec2408ded0700c841bf201eafbb (diff) | |
| download | puppet-cb552af357763310ca4a16bf514dd39fcbd203bf.tar.gz puppet-cb552af357763310ca4a16bf514dd39fcbd203bf.tar.xz puppet-cb552af357763310ca4a16bf514dd39fcbd203bf.zip | |
(#4258) Remove superfluous command check that called pkgutil
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/provider/package/pkgutil.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb index ab8a507f6..a1d844f73 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" |