summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfredrik-eriksson <fredrik.eriksson@loopia.se>2011-01-25 09:27:54 +0100
committerDaniel Pittman <daniel@rimspace.net>2011-01-26 00:15:09 -0800
commitaf1c1febd6ae4accf840279539855592705878bf (patch)
tree29cf48ff2ca6d8baa1e07c846aae52c9a5494b83
parentd8716416746b4a88c05fa9583a08ba9b5b624787 (diff)
downloadpuppet-af1c1febd6ae4accf840279539855592705878bf.tar.gz
puppet-af1c1febd6ae4accf840279539855592705878bf.tar.xz
puppet-af1c1febd6ae4accf840279539855592705878bf.zip
Feature #5855 -- fix withenv call in freebsd package provider
Qualify 'withenv' in the provider, since it is part of an entirely different part of puppet, not a method on this provider. This closes #5855. Signed-off-by: fredrik-eriksson <fredrik.eriksson@loopia.se> Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
-rwxr-xr-xlib/puppet/provider/package/freebsd.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb
index 2f012a4ed..e10a20b04 100755
--- a/lib/puppet/provider/package/freebsd.rb
+++ b/lib/puppet/provider/package/freebsd.rb
@@ -20,11 +20,11 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
if @resource[:source] =~ /\/$/
if @resource[:source] =~ /^(ftp|https?):/
- withenv :PACKAGESITE => @resource[:source] do
+ Puppet::Util::Execution::withenv :PACKAGESITE => @resource[:source] do
pkgadd "-r", @resource[:name]
end
else
- withenv :PKG_PATH => @resource[:source] do
+ Puppet::Util::Execution::withenv :PKG_PATH => @resource[:source] do
pkgadd @resource[:name]
end
end