Changeset 425 in tailor

Timestamp:

07/25/05 22:59:07 (8 years ago)

Author:

lele@…

Hash name:

20050725205907-97f81-64d1f236956acd6948c0bd1c75d44eb96e07b100

Message:

Was still considering output a StringIO object

File:

• vcpx/darcs.py (modified) (5 diffs)

vcpx/darcs.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import ExternalCommand, PIPE
+from shwrap import ExternalCommand, PIPE, STDOUT
 from source import UpdatableSourceWorkingDir, ChangesetApplicationFailure, \
      GetUpstreamChangesetsFailure
@@ -140 +140 @@
         cmd = [DARCS_CMD, "pull", "--dry-run"]
         pull = ExternalCommand(cwd=root, command=cmd)
-        output = pull.execute(repository, stdout=PIPE, TZ='UTC')
+        output = pull.execute(repository, stdout=PIPE, stderr=STDOUT, TZ='UTC')
         
         if pull.exit_status:
             raise GetUpstreamChangesetsFailure(
                 "%s returned status %d saying \"%s\"" %
-                (str(pull), pull.exit_status, output.strip()))
+                (str(pull), pull.exit_status, output.read()))
 
         l = output.readline()
@@ -206 +206 @@
         cmd = [DARCS_CMD, "pull", "--all", selector, revtag]
         pull = ExternalCommand(cwd=root, command=cmd)
-        output = pull.execute(stdout=PIPE)
+        output = pull.execute(stdout=PIPE, stderr=STDOUT)
         
         if pull.exit_status:
             raise ChangesetApplicationFailure(
                 "%s returned status %d saying \"%s\"" %
-                (str(pull), pull.exit_status, output.strip()))
+                (str(pull), pull.exit_status, output.read()))
 
         cmd = [DARCS_CMD, "changes", selector, revtag,
@@ -250 +250 @@
                     cmd.extend(["--tag", revision])
                 dpull = ExternalCommand(cwd=wdir, command=cmd)
-                output = dpull.execute(repository, stdout=PIPE)
+                output = dpull.execute(repository, stdout=PIPE, stderr=STDOUT)
                         
                 if dpull.exit_status:
                     raise TargetInitializationFailure(
                         "%s returned status %d saying \"%s\"" %
-                        (str(dpull), dpull.exit_status, output.strip()))
+                        (str(dpull), dpull.exit_status, output.read()))
         else:
             # Use much faster 'darcs get'
@@ -264 +264 @@
                 cmd.extend(["--tag", revision])
             dget = ExternalCommand(cwd=basedir, command=cmd)
-            output = dget.execute(repository, subdir, stdout=PIPE)
+            output = dget.execute(repository, subdir,
+                                  stdout=PIPE, stderr=STDOUT)
             
             if dget.exit_status:
                 raise TargetInitializationFailure(
                     "%s returned status %d saying \"%s\"" %
-                    (str(dget), dget.exit_status, output.strip()))
+                    (str(dget), dget.exit_status, output.read()))
 
         cmd = [DARCS_CMD, "changes", "--last", "1", "--xml-output"]
         changes = ExternalCommand(cwd=wdir, command=cmd)
-        output = changes.execute(stdout=PIPE)
+        output = changes.execute(stdout=PIPE, stderr=STDOUT)
         
         if changes.exit_status:
             raise ChangesetApplicationFailure(
                 "%s returned status %d saying \"%s\"" %
-                (str(changes), changes.exit_status, output.strip()))
+                (str(changes), changes.exit_status, output.read()))
         
         last = changesets_from_darcschanges(output)