summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/util.rb')
-rw-r--r--lib/puppet/util.rb16
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index fa4d0fae4..8740c7407 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -297,21 +297,6 @@ module Util
if f
output = f.read
else
- # FIXME There really should be a better way to do this,
- # but it looks like webrick is already setting close_on_exec,
- # and setting it myself doesn't seem to do anything. So,
- # not the best, but it'll have to do.
- if Puppet[:listen]
- ObjectSpace.each_object do |object|
- if object.is_a?(TCPServer) and ! object.closed?
- begin
- object.close
- rescue
- # Just ignore these, I guess
- end
- end
- end
- end
begin
$stderr.close
$stderr = $stdout.dup
@@ -328,7 +313,6 @@ module Util
else
Kernel.exec(command)
end
- exit!($?.exitstatus)
rescue => detail
puts detail.to_s
exit!(1)