diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-01-26 00:15:34 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-01-26 00:15:34 -0800 |
| commit | 1dc6b42d5dbaf0ca2ad1b1e9dd2a5788bcdb643d (patch) | |
| tree | 29cf48ff2ca6d8baa1e07c846aae52c9a5494b83 /lib/puppet | |
| parent | 3478190ce9b8f28c0e36c8102342471eda2ca446 (diff) | |
| parent | af1c1febd6ae4accf840279539855592705878bf (diff) | |
| download | puppet-1dc6b42d5dbaf0ca2ad1b1e9dd2a5788bcdb643d.tar.gz puppet-1dc6b42d5dbaf0ca2ad1b1e9dd2a5788bcdb643d.tar.xz puppet-1dc6b42d5dbaf0ca2ad1b1e9dd2a5788bcdb643d.zip | |
Merge branch 'bug/2.6.next/5855-freebsd-withenv' into 2.6.next
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/provider/package/freebsd.rb | 4 |
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 |