Add more information about buildbot upgrade errors (Refs: #2588)

buildbot · Oct 19, 2014 · 1cba0fd · 1cba0fd
1 parent daa4841
commit 1cba0fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/master/buildbot/scripts/upgrade_master.py b/master/buildbot/scripts/upgrade_master.py
@@ -48,10 +48,14 @@ def checkBasedir(config):
     tac = base.getConfigFromTac(config['basedir'])
     if tac:
         if isinstance(tac.get('rotateLength', 0), str):
-            print "WARNING: rotateLength is a string, it should be a number"
+            print "ERROR: rotateLength is a string, it should be a number"
+            print "ERROR: Please, edit your buildbot.tac file and run again"
+            print "ERROR: See http://trac.buildbot.net/ticket/2588 for more details"
             return False
         if isinstance(tac.get('maxRotatedFiles', 0), str):
-            print "WARNING: maxRotatedFiles is a string, it should be a number"
+            print "ERROR: maxRotatedFiles is a string, it should be a number"
+            print "ERROR: Please, edit your buildbot.tac file and run again"
+            print "ERROR: See http://trac.buildbot.net/ticket/2588 for more details"
             return False
 
     return True

diff --git a/master/contrib/init-scripts/buildmaster.init.sh b/master/contrib/init-scripts/buildmaster.init.sh
@@ -169,8 +169,12 @@ case "$1" in
         do_op "master_op" "restart" "Restarting buildmaster" "$2"
         exit $?
         ;;
+    upgrade)
+        do_op "master_op" "upgrade-master" "Upgrading buildmaster" "$2"
+        exit $?
+        ;;
     *)
-        echo "Usage: $0 {start|stop|restart|reload|force-reload}"
+        echo "Usage: $0 {start|stop|restart|reload|force-reload|upgrade}"
         exit 1
         ;;
 esac