diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/package/portage.rb | 4 | ||||
| -rwxr-xr-x | lib/puppet/provider/service/debian.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb index 866ec8730..6a42444ef 100644 --- a/lib/puppet/provider/package/portage.rb +++ b/lib/puppet/provider/package/portage.rb @@ -55,7 +55,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa # The common package name format. def package_name - "%s/%s" % [@resource[:category], @resource[:name]] + @resource[:category] ? "%s/%s" % [@resource[:category], @resource[:name]] : @resource[:name] end def uninstall @@ -71,7 +71,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description] search_field = @resource[:category] ? "--category-name" : "--name" - search_value = @resource[:category] ? package_name : @resource[:name] + search_value = package_name search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>" begin diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb index d810eac1b..0ba7e1a79 100755 --- a/lib/puppet/provider/service/debian.rb +++ b/lib/puppet/provider/service/debian.rb @@ -17,7 +17,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do # If it's enabled, then it will print output showing removal of # links. - if output =~ /etc\/rc[\dS].d|Nothing to do\./ + if output =~ /etc\/rc[\dS].d|not installed/ return :true else return :false |