[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1613-ga91c476
James Turnbull
james at lovedthanlost.net
Mon Jan 25 05:48:54 UTC 2010
The following commit has been merged in the upstream branch:
commit 75634b72629c4ed308444d64341dc909d1ab497e
Author: Markus Roberts <Markus at reality.com>
Date: Wed Jan 20 15:33:36 2010 -0800
Fix for #3093 (also need to be able to call pkgget_with_cat on class)
Fixed to deal with scopig issues.
diff --git a/lib/puppet/provider/package/blastwave.rb b/lib/puppet/provider/package/blastwave.rb
index cf2c87b..9b2bbf6 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 =~ /^#/
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list