From: Han-Wen Nienhuys <hanwen@google.com>
Date: Wed, 23 May 2007 21:49:35 +0000 (-0300)
Subject: Merge origin.
X-Git-Tag: v1.5.3-rc0~65^2^2~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e926eed9fb8746e762bdb147f35d44c7a65321e;p=git.git

Merge origin.
---

5e926eed9fb8746e762bdb147f35d44c7a65321e
diff --cc contrib/fast-import/git-p4
index b280e9774,794286ee8..28ea53dea
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@@ -35,8 -35,8 +35,8 @@@ def read_pipe(c, ignore_error=False)
  
      pipe = os.popen(c, 'rb')
      val = pipe.read()
 -    if pipe.close():
 -        sys.stderr.write('Command failed: %s' % c)
 +    if pipe.close() and not ignore_error:
-         sys.stderr.write('Command %s failed\n' % c)
++        sys.stderr.write('Command failed: %s\n' % c)
          sys.exit(1)
  
      return val
@@@ -49,7 -49,7 +49,7 @@@ def read_pipe_lines(c)
      pipe = os.popen(c, 'rb')
      val = pipe.readlines()
      if pipe.close():
-         sys.stderr.write('Command %s failed\n' % c)
 -        sys.stderr.write('Command failed: %s' % c)
++        sys.stderr.write('Command failed: %s\n' % c)
          sys.exit(1)
  
      return val