summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNigel Kersten <nigelk@google.com>2009-06-26 13:28:44 -0700
committerJames Turnbull <james@lovedthanlost.net>2009-06-28 09:39:31 +1000
commita6816fff5a0421d614da50eeaf12aa7178a82b09 (patch)
tree594946af05b6827409fff6ee24824897d44313f9
parent64a47203e69746e7e3724e3433702856e68c068d (diff)
downloadpuppet-a6816fff5a0421d614da50eeaf12aa7178a82b09.tar.gz
puppet-a6816fff5a0421d614da50eeaf12aa7178a82b09.tar.xz
puppet-a6816fff5a0421d614da50eeaf12aa7178a82b09.zip
Set ENV['PATH'] to an empty string if non-existent
Signed-off-by: Nigel Kersten <nigelk@google.com>
-rw-r--r--lib/puppet/defaults.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 328189038..b2de823a5 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -91,8 +91,8 @@ module Puppet
from the parent process.",
:call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
:hook => proc do |value|
+ ENV["PATH"] = "" if ENV["PATH"].nil?
ENV["PATH"] = value unless value == "none"
-
paths = ENV["PATH"].split(File::PATH_SEPARATOR)
%w{/usr/sbin /sbin}.each do |path|
unless paths.include?(path)