Renmaing Puppet::Network::Client::Master to Puppet::Agent

Made minor changes, including removing the parent class.

The functionality hasn't changed yet -- that comes in later patches --
but all but a couple of the older tests pass.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/agent.rb
index 047f2b82a..f6d96acc2 100644
--- a/lib/puppet/network/client/master.rb
+++ b/lib/puppet/agent.rb
@@ -2,8 +2,12 @@
 require 'sync'
 require 'timeout'
 require 'puppet/network/http_pool'
+require 'puppet/util'
+
+class Puppet::Agent
+    # For benchmarking
+    include Puppet::Util
 
-class Puppet::Network::Client::Master < Puppet::Network::Client
     unless defined? @@sync
         @@sync = Sync.new
     end
@@ -136,7 +140,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
             facts = self.class.facts
         end
 
-        raise Puppet::Network::ClientError.new("Could not retrieve any facts") unless facts.length > 0
+        raise Puppet::Error.new("Could not retrieve any facts") unless facts.length > 0
 
         Puppet.debug("Retrieving catalog")
 
@@ -192,9 +196,8 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     end
     
     # Just so we can specify that we are "the" instance.
-    def initialize(*args)
+    def initialize
         Puppet.settings.use(:main, :ssl, :puppetd)
-        super
 
         self.class.instance = self
         @running = false