summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2013-07-25 12:09:51 -0700
committerAaron Stone <aaron@serendipity.cx>2013-07-25 12:45:36 -0700
commit7b2b5e766ede2408079a8760221d653e2e32eef4 (patch)
tree0abfe677d87ef91126b76afc9f072a9eadb61daa /lib
parent7e87ef1cf732641fa6390bf2c9011e4277b01aea (diff)
downloadpuppet-vcsrepo-7b2b5e766ede2408079a8760221d653e2e32eef4.tar.gz
puppet-vcsrepo-7b2b5e766ede2408079a8760221d653e2e32eef4.tar.bz2
The location of Puppet::Util[::Execution].withenv changed from Puppet 2.x to 3.x
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/provider/vcsrepo/cvs.rb7
1 files changed, 6 insertions, 1 deletions
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