summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-05-16 17:03:42 -0700
committerNick Lewis <nick@puppetlabs.com>2011-05-16 17:03:42 -0700
commit3197e21069e797faadc8ee1716207a4cf98d6eee (patch)
treeb73bacca9859e063138e9a14bd08073995a9637c /lib
parent8f58db9188359ab8c8988e56b1abf0ec3bbc1303 (diff)
downloadpuppet-3197e21069e797faadc8ee1716207a4cf98d6eee.tar.gz
puppet-3197e21069e797faadc8ee1716207a4cf98d6eee.tar.xz
puppet-3197e21069e797faadc8ee1716207a4cf98d6eee.zip
(#7298) require 'English' to provide $CHILD_STATUS in Ruby 1.9
This had been coming from 'cgi', but in Ruby 1.9, cgi no longer requires English. Since we use $CHILD_STATUS when execing, we need to have it available, so require it manually. This also provides the other named special globals, should we choose to use them. Paired-With: Josh Cooper
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/util.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index d06f44808..ce9d4642b 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -1,5 +1,6 @@
# A module to collect utility functions.
+require 'English'
require 'puppet/util/monkey_patches'
require 'sync'
require 'puppet/external/lock'