Changeset 31

Timestamp:

Dec 18, 2009 3:41:19 AM (15 years ago)

Author:

retracile

Message:

subprocess.check_call is new in 2.5, use subprocess.call instead

Location:

mergebot/trunk/mergebot

Files:

• ticket_actions.py (modified) (2 diffs)
• web_ui.py (modified) (2 diffs)

mergebot/trunk/mergebot/ticket_actions.py

@@ -1 +1 @@
 import socket
 import time
-from subprocess import check_call
+from subprocess import call
 
 from genshi.builder import tag
@@ -66 +66 @@
 
     def start_daemon(self):
-        check_call(['mergebotdaemon', self.env.path])
+        retval = call(['mergebotdaemon', self.env.path])
+        if retval:
+            raise Exception('mergebotdaemon failed to start (%s)' % retval)
         time.sleep(1) # bleh
 

mergebot/trunk/mergebot/web_ui.py

@@ -5 +5 @@
 import os
 import base64
-from subprocess import check_call
+from subprocess import call
 
 from trac.core import *
@@ -96 +96 @@
 
     def start_daemon(self):
-        check_call(['mergebotdaemon', self.env.path])
+        retval = call(['mergebotdaemon', self.env.path])
+        if retval:
+            raise Exception('mergebotdaemon failed to start' % retval)
         time.sleep(1) # bleh