diff options
Diffstat (limited to 'lib/puppet/provider/package')
-rw-r--r-- | lib/puppet/provider/package/hpux.rb | 4 | ||||
-rwxr-xr-x | lib/puppet/provider/package/openbsd.rb | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/puppet/provider/package/hpux.rb b/lib/puppet/provider/package/hpux.rb index f3283de08..4d5394643 100644 --- a/lib/puppet/provider/package/hpux.rb +++ b/lib/puppet/provider/package/hpux.rb @@ -27,12 +27,10 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package end def query - begin swlist resource[:name] {:ensure => :present} - rescue + rescue {:ensure => :absent} - end end def uninstall diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb index cff599bca..4a19a883c 100755 --- a/lib/puppet/provider/package/openbsd.rb +++ b/lib/puppet/provider/package/openbsd.rb @@ -76,7 +76,6 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa end def get_version - begin execpipe([command(:pkginfo), " -I ", @resource[:name]]) do |process| # our regex for matching pkg_info output regex = /^(.*)-(\d[^-]*)[-]?(\D*)(.*)$/ @@ -96,9 +95,8 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa return master_version unless master_version == 0 raise Puppet::Error, "#{version} is not available for this package" end - rescue Puppet::ExecutionFailure + rescue Puppet::ExecutionFailure return nil - end end def query |