Trying to fix the problem that occurs when noop somehow manages to be nil when downloading files

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2357 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 9 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.
diff --git a/lib/puppet/type/pfilebucket.rb b/lib/puppet/type/pfilebucket.rb
index 9ed2bdb59..162983e66 100755
--- a/lib/puppet/type/pfilebucket.rb
+++ b/lib/puppet/type/pfilebucket.rb
@@ -1,4 +1,6 @@
 module Puppet
+    require 'puppet/network/client'
+
     newtype(:filebucket) do
         @doc = "A repository for backing up files.  If no filebucket is
             defined, then files will be backed up in their current directory,