A stop action on an already stopped master/slave should return 0

Returning a non-zero exit status when attempting to stop an already
stopped service goes against the LSB init script specifications [1].
Although, the runner scripts are not init scripts (duh) this behaviour
does seem to make more sense (sense is subjective, of course)

[1] http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html

master/buildbot/scripts/runner.py

@@ -1131,7 +1131,13 @@ def run():
 
         start(so)
     elif command == "stop":
-        stop(so, wait=True)
+        try:
+            stop(so, wait=True)
+        except BuildbotNotRunningError:
+            if not so['quiet']:
+                print "buildmaster not running"
+                sys.exit(0)
+
     elif command == "restart":
         restart(so)
     elif command == "reconfig" or command == "sighup":

slave/buildslave/scripts/runner.py

@@ -182,8 +182,8 @@ def stop(config, signame="TERM", wait=False, returnFalseOnNotRunning=False):
     except:
         if returnFalseOnNotRunning:
             return False
-        print "buildslave not running."
-        sys.exit(1)
+        if not quiet: print "buildslave not running."
+        sys.exit(0)
     pid = int(f.read().strip())
     signum = getattr(signal, "SIG"+signame)
     timer = 0