summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-26 00:38:02 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-26 00:38:02 +0000
commit9f8a3b1c45fa3957292ed0a743538559bb49c11e (patch)
tree5cb878b87144aec97ed2dd51f134884d6b46c7b5 /lib
parentca1e36b2848dcd2357bb9944d0caaec722215104 (diff)
downloadpuppet-9f8a3b1c45fa3957292ed0a743538559bb49c11e.tar.gz
puppet-9f8a3b1c45fa3957292ed0a743538559bb49c11e.tar.xz
puppet-9f8a3b1c45fa3957292ed0a743538559bb49c11e.zip
Removing an extraneous debug message, and fixing the case where the server compile fails in --test mode -- it resulted in an extra warning message.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2088 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/client/master.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb
index 35368de99..e7bbe538e 100644
--- a/lib/puppet/client/master.rb
+++ b/lib/puppet/client/master.rb
@@ -191,7 +191,6 @@ class Puppet::Client::MasterClient < Puppet::Client
# Check whether our configuration is up to date
def fresh?
unless self.compile_time
- Puppet.warning "No compile time"
return false
end
@@ -199,7 +198,6 @@ class Puppet::Client::MasterClient < Puppet::Client
if @driver.freshness - @compile_time < 1
return true
else
- Puppet.warning "%s vs %s" % [@driver.freshness, @compile_time]
return false
end
end
@@ -245,7 +243,10 @@ class Puppet::Client::MasterClient < Puppet::Client
)
end
- objects = get_actual_config(facts)
+ unless objects = get_actual_config(facts)
+ @objects = nil
+ return
+ end
unless objects.is_a?(Puppet::TransBucket)
raise NetworkClientError,