diff options
| author | Markus Roberts <Markus@reality.com> | 2010-01-20 15:33:36 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-01-22 10:45:15 +1100 |
| commit | 75634b72629c4ed308444d64341dc909d1ab497e (patch) | |
| tree | 12e344363191530a8ba2c678d90b7eee1fe85265 /lib | |
| parent | 94e269cbc98e774630426aa0a0dc70c1db82502d (diff) | |
| download | puppet-75634b72629c4ed308444d64341dc909d1ab497e.tar.gz puppet-75634b72629c4ed308444d64341dc909d1ab497e.tar.xz puppet-75634b72629c4ed308444d64341dc909d1ab497e.zip | |
Fix for #3093 (also need to be able to call pkgget_with_cat on class)
Fixed to deal with scopig issues.
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/puppet/provider/package/blastwave.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/package/blastwave.rb b/lib/puppet/provider/package/blastwave.rb index cf2c87bfe..9b2bbf6a5 100755 --- a/lib/puppet/provider/package/blastwave.rb +++ b/lib/puppet/provider/package/blastwave.rb @@ -11,7 +11,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun commands :pkgget => pkgget def pkgget_with_cat(*args) - withenv(:PAGER => "/usr/bin/cat") { pkgget(*args) } + Puppet::Util::Execution::withenv(:PAGER => "/usr/bin/cat") { pkgget(*args) } end def self.extended(mod) @@ -41,7 +41,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun command << hash[:justme] end - output = pkgget_with_cat command + output = Puppet::Util::Execution::withenv(:PAGER => "/usr/bin/cat") { pkgget command } list = output.split("\n").collect do |line| next if line =~ /^#/ |
