summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/network')
-rw-r--r--lib/puppet/network/client/master.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb
index 52a569b36..a4ffefea5 100644
--- a/lib/puppet/network/client/master.rb
+++ b/lib/puppet/network/client/master.rb
@@ -398,7 +398,13 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
objects.remove
files
ensure
- Puppet[:noop] = noop
+ # I can't imagine why this is necessary, but apparently at last one person has had problems with noop
+ # being nil here.
+ if noop.nil?
+ Puppet[:noop] = false
+ else
+ Puppet[:noop] = noop
+ end
end
# Retrieve facts from the central server.