diff options
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/autoload.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/command_line.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/rdoc/generators/puppet_generator.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/reference.rb | 14 | ||||
| -rw-r--r-- | lib/puppet/util/suidmanager.rb | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 27a361396..f0be0ece2 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -143,6 +143,6 @@ class Puppet::Util::Autoload end def search_directories(env=nil) - [module_directories(env), Puppet[:libdir].split(File::PATH_SEPARATOR), $:].flatten + [module_directories(env), Puppet[:libdir].split(File::PATH_SEPARATOR), $LOAD_PATH].flatten end end diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index 9ccc94a23..fa1b08b70 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -33,7 +33,7 @@ module Puppet end def available_subcommands - absolute_appdir = $:.collect { |x| File.join(x,'puppet','application') }.detect{ |x| File.directory?(x) } + absolute_appdir = $LOAD_PATH.collect { |x| File.join(x,'puppet','application') }.detect{ |x| File.directory?(x) } Dir[File.join(absolute_appdir, '*.rb')].map{|fn| File.basename(fn, '.rb')} end diff --git a/lib/puppet/util/rdoc/generators/puppet_generator.rb b/lib/puppet/util/rdoc/generators/puppet_generator.rb index c2c27c8eb..c32a401bd 100644 --- a/lib/puppet/util/rdoc/generators/puppet_generator.rb +++ b/lib/puppet/util/rdoc/generators/puppet_generator.rb @@ -177,7 +177,7 @@ module Generators File.makedirs(NODE_DIR) File.makedirs(PLUGIN_DIR) rescue - $stderr.puts $!.message + $stderr.puts $ERROR_INFO.message exit 1 end end diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb index f34e54b8c..74d75bb3f 100644 --- a/lib/puppet/util/reference.rb +++ b/lib/puppet/util/reference.rb @@ -41,10 +41,10 @@ class Puppet::Util::Reference f.puts text end rst2latex = %x{which rst2latex} - if $? != 0 or rst2latex =~ /no / + if $CHILD_STATUS != 0 or rst2latex =~ /no / rst2latex = %x{which rst2latex.py} end - if $? != 0 or rst2latex =~ /no / + if $CHILD_STATUS != 0 or rst2latex =~ /no / raise "Could not find rst2latex" end rst2latex.chomp! @@ -53,7 +53,7 @@ class Puppet::Util::Reference # If we get here without an error, /tmp/puppetdoc.tex isn't a tricky cracker's symlink end output = %x{#{cmd}} - unless $? == 0 + unless $CHILD_STATUS == 0 $stderr.puts "rst2latex failed" $stderr.puts output exit(1) @@ -75,16 +75,16 @@ class Puppet::Util::Reference f.puts text end pandoc = %x{which pandoc} - if $? != 0 or pandoc =~ /no / + if $CHILD_STATUS != 0 or pandoc =~ /no / pandoc = %x{which pandoc} end - if $? != 0 or pandoc =~ /no / + if $CHILD_STATUS != 0 or pandoc =~ /no / raise "Could not find pandoc" end pandoc.chomp! cmd = %{#{pandoc} -s -r rst -w markdown #{dir}/#{name}.rst -o #{dir}/#{name}.mdwn} output = %x{#{cmd}} - unless $? == 0 + unless $CHILD_STATUS == 0 $stderr.puts "Pandoc failed to create #{name} reference." $stderr.puts output exit(1) @@ -201,7 +201,7 @@ class Puppet::Util::Reference puts "Writing %s reference to trac as %s" % [@name, @page] cmd = %{sudo trac-admin /opt/rl/trac/puppet wiki import %s /tmp/puppetdoc.txt} % self.page output = %x{#{cmd}} - unless $? == 0 + unless $CHILD_STATUS == 0 $stderr.puts "trac-admin failed" $stderr.puts output exit(1) diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb index b8e7d534c..404f78890 100644 --- a/lib/puppet/util/suidmanager.rb +++ b/lib/puppet/util/suidmanager.rb @@ -90,7 +90,7 @@ module Puppet::Util::SUIDManager def run_and_capture(command, new_uid=nil, new_gid=nil) output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid) - [output, $?.dup] + [output, $CHILD_STATUS.dup] end module_function :run_and_capture @@ -98,7 +98,7 @@ module Puppet::Util::SUIDManager status = nil asuser(new_uid, new_gid) do Kernel.system(command) - status = $?.dup + status = $CHILD_STATUS.dup end status end |