summaryrefslogtreecommitdiffstats
path: root/lib/puppet/agent.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/agent.rb')
-rw-r--r--lib/puppet/agent.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/puppet/agent.rb b/lib/puppet/agent.rb
index e7d40f68c..438b668a6 100644
--- a/lib/puppet/agent.rb
+++ b/lib/puppet/agent.rb
@@ -37,7 +37,7 @@ class Puppet::Agent
# Perform a run with our client.
def run
- if client
+ if running?
Puppet.notice "Run of %s already in progress; skipping" % client_class
return
end
@@ -56,11 +56,6 @@ class Puppet::Agent
end
end
- # If the client instance is set, we're mid-run.
- def running?
- ! client.nil?
- end
-
def stop
if self.stopping?
Puppet.notice "Already in shutdown"