diff options
| author | Scott Bonds <scott@ggr.com> | 2014-10-27 21:01:42 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-13 13:09:16 -0800 |
| commit | a07398d1068804a7b66485cb0797ce3c97ea8072 (patch) | |
| tree | af0fca93005de6f94150b78c9e9b4db6ce88254e | |
| parent | 88e67c9a11897a3ee687944810203f1ce198a3f2 (diff) | |
| download | chef-a07398d1068804a7b66485cb0797ce3c97ea8072.tar.gz | |
misc cleanup
| -rw-r--r-- | lib/chef/provider/package/openbsd.rb | 10 | ||||
| -rw-r--r-- | lib/chef/resource/openbsd_package.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/provider/package/openbsd.rb b/lib/chef/provider/package/openbsd.rb index dd97312189..d0ff8684b6 100644 --- a/lib/chef/provider/package/openbsd.rb +++ b/lib/chef/provider/package/openbsd.rb @@ -29,12 +29,12 @@ class Chef class Provider class Package class Openbsd < Chef::Provider::Package + + provides :package, os: "openbsd" + include Chef::Mixin::ShellOut include Chef::Mixin::GetSourceFromPackage - @@sqlports = nil - @@repo_packages = nil - def initialize(*args) super @current_resource = Chef::Resource::Package.new(@new_resource.name) @@ -50,7 +50,7 @@ class Chef def install_package(name, version) unless @current_resource.version version_string = '' - version_string += "-#{version}" if version && version != '0.0.0' + version_string += "-#{version}" if version if @new_resource.source =~ /\/$/ shell_out!("pkg_add -r #{name}#{version_string}", :env => { "PACKAGESITE" => @new_resource.source, 'LC_ALL' => nil }).status else @@ -62,7 +62,7 @@ class Chef def remove_package(name, version) version_string = '' - version_string += "-#{version}" if version && version != '0.0.0' + version_string += "-#{version}" if version shell_out!("pkg_delete #{name}#{version_string}", :env => nil).status end diff --git a/lib/chef/resource/openbsd_package.rb b/lib/chef/resource/openbsd_package.rb index e6788c8c37..20a2523e3a 100644 --- a/lib/chef/resource/openbsd_package.rb +++ b/lib/chef/resource/openbsd_package.rb @@ -28,7 +28,7 @@ class Chef class OpenbsdPackage < Chef::Resource::Package include Chef::Mixin::ShellOut - provides :package, :on_platforms => ["openbsd"] + provides :package, os: "openbsd" def initialize(name, run_context=nil) super |