diff options
| author | Markus Roberts <Markus@reality.com> | 2010-09-22 16:21:33 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-11-10 15:28:50 -0800 |
| commit | 4a3d5d7c11bea5efba6f8fa8074b52c7161fd1d3 (patch) | |
| tree | 75889e2524a5d66774cce4ab3529f3f08caf9fa5 /lib/puppet | |
| parent | 235d64163c9565b9e07be0873248a7da07033bff (diff) | |
| download | puppet-4a3d5d7c11bea5efba6f8fa8074b52c7161fd1d3.tar.gz puppet-4a3d5d7c11bea5efba6f8fa8074b52c7161fd1d3.tar.xz puppet-4a3d5d7c11bea5efba6f8fa8074b52c7161fd1d3.zip | |
Reimplementation of functionality removed by prior commit
This commit implements the base path-to-source functionality and adds an
(adapted) version of Matt's code on top of it.
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/provider/package/openbsd.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb index 0891844bc..bb07d894a 100755 --- a/lib/puppet/provider/package/openbsd.rb +++ b/lib/puppet/provider/package/openbsd.rb @@ -60,7 +60,15 @@ 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][-1,1] == ::File::PATH_SEPARATOR + e_vars = { :PKG_PATH => @resource[:source] } + full_name = [ @resource[:name], get_version || @resource[:ensure], @resource[:flavor] ].join('-').chomp('-') + else + e_vars = {} + full_name = @resource[:source] + end + + Puppet::Util::Execution::withenv(e_vars) { pkgadd full_name } end def get_version |
