diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-22 03:32:56 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-22 03:32:56 +0000 |
| commit | cdeccab2e0fc1b40b5060780c99d52f936f9732d (patch) | |
| tree | ea60c02ad605f553e75a19a8f5446194c4260c51 /lib/puppet/client | |
| parent | b42eaee1a7e8dd1ef7a7daad5d0b03aba6113d00 (diff) | |
Another batch of bug fixes, this time focused on OS X patches. Looks like I did not test on os x last time.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1422 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/client')
| -rw-r--r-- | lib/puppet/client/master.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/client/reporter.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb index b130f4cbf..505a2109b 100644 --- a/lib/puppet/client/master.rb +++ b/lib/puppet/client/master.rb @@ -87,6 +87,7 @@ class Puppet::Client::MasterClient < Puppet::Client end transaction.addtimes :config_retrieval => @configtime + begin transaction.evaluate rescue Puppet::Error => detail @@ -329,6 +330,8 @@ class Puppet::Client::MasterClient < Puppet::Client def initialize(*args) super + @configtime = Time.now + self.class.instance = self @running = false end diff --git a/lib/puppet/client/reporter.rb b/lib/puppet/client/reporter.rb index b0101e2fa..a92842e7c 100644 --- a/lib/puppet/client/reporter.rb +++ b/lib/puppet/client/reporter.rb @@ -1,9 +1,8 @@ -class Puppet::Client::Reporter < Puppet::Client::ProxyClient +class Puppet::Client::Reporter < Puppet::Client @drivername = :Report # set up the appropriate interface methods @handler = Puppet::Server::Report - self.mkmethods def initialize(hash = {}) if hash.include?(:Report) |