Changeset 868 in tailor

Timestamp:

10/03/05 13:44:34 (8 years ago)

Author:

lele@…

Hash name:

20051003114434-97f81-cf7f393f2f65c2161a1e3810156164c59558201c

Message:

Report back svn failure message that's printed on stderr

File:

• vcpx/svn.py (modified) (6 diffs)

vcpx/svn.py

@@ -230 +230 @@
         retry = 0
         while True:
-            out = svnup.execute(stdout=PIPE)[0]
+            out, err = svnup.execute(stdout=PIPE, stderr=PIPE)
 
             if svnup.exit_status == 1:
@@ -237 +237 @@
                     break
                 delay = 2**retry
-                self.log_info("%s returned status %s saying \"%s\", "
+                self.log_info("%s returned status %s saying %r, "
                               "retrying in %d seconds..." %
-                              (str(svnup), svnup.exit_status, out.read(),
+                              (str(svnup), svnup.exit_status, err.read(),
                                delay))
                 sleep(delay)
@@ -274 +274 @@
                                           "--revision", "1:HEAD")
             svnlog = ExternalCommand(command=cmd)
-            output = svnlog.execute("%s%s" % (self.repository.repository,
-                                              self.repository.module),
-                                    stdout=PIPE)[0]
+            out, err = svnlog.execute("%s%s" % (self.repository.repository,
+                                                self.repository.module),
+                                      stdout=PIPE, stderr=PIPE)
 
             if svnlog.exit_status:
                 raise TargetInitializationFailure(
-                    "%s returned status %d saying \"%s\"" %
-                    (str(svnlog), svnlog.exit_status, output.read()))
-
-            csets = changesets_from_svnlog(output,
+                    "%s returned status %d saying %r" %
+                    (str(svnlog), svnlog.exit_status, err.read()))
+
+            csets = changesets_from_svnlog(out,
                                            self.repository.repository,
                                            self.repository.module)
@@ -295 +295 @@
                                           "--revision", revision)
             svnco = ExternalCommand(command=cmd)
-            svnco.execute("%s%s" % (self.repository.repository,
-                                    self.repository.module), self.basedir)
+            out, err = svnco.execute("%s%s" % (self.repository.repository,
+                                               self.repository.module),
+                                     self.basedir, stdout=PIPE, stderr=PIPE)
             if svnco.exit_status:
                 raise TargetInitializationFailure(
-                    "%s returned status %s" % (str(svnco), svnco.exit_status))
+                    "%s returned status %s saying %r" % (str(svnco),
+                                                         svnco.exit_status,
+                                                         err.read()))
         else:
             self.log_info("%s already exists, assuming it's a svn working dir" % self.basedir)
@@ -307 +310 @@
                                           "--revision", revision=='HEAD' and 'COMMITTED' or revision)
             svnlog = ExternalCommand(cwd=self.basedir, command=cmd)
-            output = svnlog.execute(stdout=PIPE)[0]
+            out, err = svnlog.execute(stdout=PIPE, stderr=PIPE)
 
             if svnlog.exit_status:
                 raise TargetInitializationFailure(
-                    "%s returned status %d saying \"%s\"" %
-                    (str(changes), changes.exit_status, output.read()))
-
-            csets = changesets_from_svnlog(output,
+                    "%s returned status %d saying %r" %
+                    (str(changes), changes.exit_status, err.read()))
+
+            csets = changesets_from_svnlog(out,
                                            self.repository.repository,
                                            self.repository.module)
@@ -376 +379 @@
         log.close()
 
-        cmd = self.repository.command("commit", "--file", rontf.name)
+        cmd = self.repository.command("commit", "--quiet", "--file", rontf.name)
         commit = ExternalCommand(cwd=self.basedir, command=cmd)