1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7ef4ebeaa607/
Changeset: 7ef4ebeaa607
User: dannon
Date: 2015-02-10 18:14:21+00:00
Summary: Merged in nsoranzo/galaxy-central (pull request #658)
Don't abort restart if stop_daemon() failed.
Affected #: 1 file
diff -r 23df5eac97f7c05da1e06fb63a0385b1c416d535 -r 7ef4ebeaa607b32151ca30c96ba774a3fc0d2274 lib/galaxy/util/pastescript/serve.py
--- a/lib/galaxy/util/pastescript/serve.py
+++ b/lib/galaxy/util/pastescript/serve.py
@@ -559,11 +559,7 @@
if cmd == 'restart' or cmd == 'stop':
result = self.stop_daemon()
if result:
- if cmd == 'restart':
- print "Could not stop daemon; aborting"
- else:
- print "Could not stop daemon"
- return result
+ print "Could not stop daemon"
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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e2aabc243d30/
Changeset: e2aabc243d30
User: nsoranzo
Date: 2015-02-03 11:51:07+00:00
Summary: Don't abort restart if stop_daemon() failed.
Affected #: 1 file
diff -r adcb595753b02cc9757a8f36a34898d4ea2233e7 -r e2aabc243d30093d086ced855eae2e6cbfc089cd lib/galaxy/util/pastescript/serve.py
--- a/lib/galaxy/util/pastescript/serve.py
+++ b/lib/galaxy/util/pastescript/serve.py
@@ -559,11 +559,7 @@
if cmd == 'restart' or cmd == 'stop':
result = self.stop_daemon()
if result:
- if cmd == 'restart':
- print "Could not stop daemon; aborting"
- else:
- print "Could not stop daemon"
- return result
+ print "Could not stop daemon"
if cmd == 'stop':
return result
self.options.daemon = True
https://bitbucket.org/galaxy/galaxy-central/commits/7ef4ebeaa607/
Changeset: 7ef4ebeaa607
User: dannon
Date: 2015-02-10 18:14:21+00:00
Summary: Merged in nsoranzo/galaxy-central (pull request #658)
Don't abort restart if stop_daemon() failed.
Affected #: 1 file
diff -r 23df5eac97f7c05da1e06fb63a0385b1c416d535 -r 7ef4ebeaa607b32151ca30c96ba774a3fc0d2274 lib/galaxy/util/pastescript/serve.py
--- a/lib/galaxy/util/pastescript/serve.py
+++ b/lib/galaxy/util/pastescript/serve.py
@@ -559,11 +559,7 @@
if cmd == 'restart' or cmd == 'stop':
result = self.stop_daemon()
if result:
- if cmd == 'restart':
- print "Could not stop daemon; aborting"
- else:
- print "Could not stop daemon"
- return result
+ print "Could not stop daemon"
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.