Changeset 61

Timestamp:

Feb 23, 2010 9:34:49 PM (15 years ago)

Author:

retracile

Message:

Mergebot: convert an os.system call to subprocess

File:

• mergebot/trunk/mergebot/svn.py (modified) (2 diffs)

mergebot/trunk/mergebot/svn.py

@@ -31 +31 @@
         """Log the cmd string, then execute it, appending its stdout and stderr
         to logfile."""
-        open(logfile, "a").write("%s: %s\n" % (time.asctime(), cmd))
-        return os.system("(%s) >>%s 2>&1" % (cmd, logfile))
+        log = open(logfile, "a")
+        log.write("%s: %s\n" % (time.asctime(), cmd))
+        task = subprocess.Popen(cmd, stdout=log, stderr=log)
+        task.communicate()
+        return task.wait()
 
     def get_rev_from_log(self, logentry):
@@ -77 +80 @@
         """Create a branch copying from_url to to_url.  Commit as mergebot, and
         use the provided commit message."""
-        svncmd = \
-            "svn copy --username=mergebot --password=mergebot -m %s %s %s" \
-            % (shell_quote(commit_message), from_url, to_url)
+        svncmd = ['svn', 'copy', '--username=mergebot', '--password=mergebot',
+            '-m', shell_quote(commit_message), from_url, to_url]
         return self.logcmd(svncmd, logfile)