Fixing backgrounding in puppetrun; I had the bit flipped between the client and the server, such that setting --foreground caused the clients to go into the background.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/puppet/server/runner.rb b/lib/puppet/server/runner.rb
index d53b6c9b1..079197751 100755
--- a/lib/puppet/server/runner.rb
+++ b/lib/puppet/server/runner.rb
@@ -10,7 +10,7 @@ class Server
 
         # Run the client configuration right now, optionally specifying
         # tags and whether to ignore schedules
-        def run(tags = [], ignoreschedules = false, bg = true, client = nil, clientip = nil)
+        def run(tags = [], ignoreschedules = false, fg = true, client = nil, clientip = nil)
             # We need to retrieve the client
             master = Puppet::Client::MasterClient.instance
 
@@ -45,13 +45,12 @@ class Server
             end
 
             # And then we need to tell it to run, with this extra info.
-            # By default, stick it in a thread
-            if bg
+            if fg
+                master.run(tags, ignoreschedules)
+            else
                 Puppet.newthread do
                     master.run(tags, ignoreschedules)
                 end
-            else
-                master.run(tags, ignoreschedules)
             end
 
             return "success"