From 7b2b5e766ede2408079a8760221d653e2e32eef4 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 25 Jul 2013 12:09:51 -0700 Subject: The location of Puppet::Util[::Execution].withenv changed from Puppet 2.x to 3.x --- lib/puppet/provider/vcsrepo/cvs.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/puppet') diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb index 6b64ba7..206e732 100644 --- a/lib/puppet/provider/vcsrepo/cvs.rb +++ b/lib/puppet/provider/vcsrepo/cvs.rb @@ -125,7 +125,12 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) e = {} end - Puppet::Util::Execution.withenv e do + # The location of withenv changed from Puppet 2.x to 3.x + withenv = Puppet::Util.method(:withenv) if Puppet::Util.respond_to?(:withenv) + withenv = Puppet::Util::Execution.method(:withenv) if Puppet::Util::Execution.respond_to?(:withenv) + fail("Cannot set custom environment #{e}") if e && !withenv + + withenv.call e do Puppet.debug cvs *args end end -- cgit v1.2.3