summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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