summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRyan McBride <mcbride@countersiege.com>2008-03-25 11:27:14 +0900
committerLuke Kanies <luke@madstop.com>2008-03-25 00:51:21 -0500
commit55a9009cbffcfc4fe5f81c24192a3b44cd95dc47 (patch)
tree3b2706615e1eb1bb9d02030ca3b80b5db2f5934c /lib
parent6a535195a908ce80ce41a403d642b3afa871534f (diff)
downloadpuppet-55a9009cbffcfc4fe5f81c24192a3b44cd95dc47.tar.gz
puppet-55a9009cbffcfc4fe5f81c24192a3b44cd95dc47.tar.xz
puppet-55a9009cbffcfc4fe5f81c24192a3b44cd95dc47.zip
Pass source to pkg_add via the PKG_PATH environment variable if
Diffstat (limited to 'lib')
-rwxr-xr-xlib/puppet/provider/package/openbsd.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
index 6c2e0895b..af590eb4d 100755
--- a/lib/puppet/provider/package/openbsd.rb
+++ b/lib/puppet/provider/package/openbsd.rb
@@ -2,6 +2,7 @@ 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"
@@ -58,7 +59,14 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
"You must specify a package source for BSD packages"
end
- pkgadd @resource[:source]
+ if @resource[:source] =~ /\/$/
+ withenv :PKG_PATH => @resource[:source] do
+ pkgadd @resource[:name]
+ end
+ else
+ pkgadd @resource[:source]
+ end
+
end
def query