Merge branch 'buildslave_noademon_fork' of git://github.com/andrewjcg…

…/buildbot
buildbot · Apr 7, 2013 · 09d91e8 · 09d91e8
2 parents 4c0e8e2 + 91ff2b3
commit 09d91e8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/slave/buildslave/scripts/startup.py b/slave/buildslave/scripts/startup.py
@@ -83,7 +83,7 @@ def start(config):
         sys.exit(1)
 
     os.chdir(config['basedir'])
-    if config['quiet']:
+    if config['quiet'] or config['nodaemon']:
         return launch(config)
 
     # we probably can't do this os.fork under windows