summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-09-22 11:38:28 -0700
committerMarkus Roberts <Markus@reality.com>2010-11-10 15:28:50 -0800
commit235d64163c9565b9e07be0873248a7da07033bff (patch)
tree1848b9800ef984e8861445feeb85102b16122e13 /lib/puppet
parent9ba0c8a22c6f9ca856851ef6c2d38242754a7a00 (diff)
downloadpuppet-235d64163c9565b9e07be0873248a7da07033bff.tar.gz
puppet-235d64163c9565b9e07be0873248a7da07033bff.tar.xz
puppet-235d64163c9565b9e07be0873248a7da07033bff.zip
Refactor for CLA
This commit removes code contributed by Ryan McBride, an author we have been unable to contact to sign a Contributor License Agreement. It also removes code writen by Matt Robinson (a Puppet Labs employee) which only made sense in the context of the removed code. The code in question comes from these commits: 6ac36eb4 Matt Robinson 55a9009c Ryan McBride
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/provider/package/openbsd.rb14
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
index 22df14d62..0891844bc 100755
--- a/lib/puppet/provider/package/openbsd.rb
+++ b/lib/puppet/provider/package/openbsd.rb
@@ -2,7 +2,6 @@ require 'puppet/provider/package'
# Packaging on OpenBSD. Doesn't work anywhere else that I know of.
Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Package do
- include Puppet::Util::Execution
desc "OpenBSD's form of `pkg_add` support."
commands :pkginfo => "pkg_info", :pkgadd => "pkg_add", :pkgdelete => "pkg_delete"
@@ -61,18 +60,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
"You must specify a package source for BSD packages"
end
- old_ensure = @resource[:ensure]
-
- if @resource[:source] =~ /\/$/
- withenv :PKG_PATH => @resource[:source] do
- @resource[:ensure] = old_ensure if (@resource[:ensure] = get_version) == nil
- full_name = [ @resource[:name], @resource[:ensure], @resource[:flavor] ]
- pkgadd full_name.join('-').chomp('-')
- end
- else
- pkgadd @resource[:source]
- end
-
+ pkgadd @resource[:source]
end
def get_version