1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/463c8b50dd5a/ Changeset: 463c8b50dd5a User: dannon Date: 2015-02-10 19:07:01+00:00 Summary: Followup to PR https://bitbucket.org/galaxy/galaxy-central/pull-request/658/, only continue restarting in the case of a 1 return code from stop_daemon Affected #: 1 file diff -r c58911f54093a4b5d963fa70393908d9e701aeaa -r 463c8b50dd5adabbe7c6c594ca367923905a7439 lib/galaxy/util/pastescript/serve.py --- a/lib/galaxy/util/pastescript/serve.py +++ b/lib/galaxy/util/pastescript/serve.py @@ -560,6 +560,10 @@ result = self.stop_daemon() if result: print "Could not stop daemon" + # It's ok to continue trying to restart if stop_daemon returns + # a 1, otherwise shortcut and return. + if cmd == 'restart' and result != 1: + return result if cmd == 'stop': return result self.options.daemon = True Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.