diff options
| author | John L. Villalovos <john.l.villalovos@intel.com> | 2015-02-25 14:27:02 -0800 |
|---|---|---|
| committer | John L. Villalovos <john.l.villalovos@intel.com> | 2015-02-25 14:29:28 -0800 |
| commit | e30f46b957c9c192f09a4907e3e7e802c9b782f8 (patch) | |
| tree | 5133f8bec8c780005dc307a6a124288e19e892fb | |
| parent | e4978cfbe32ce3c01b894f768a11c4fb56645e76 (diff) | |
| download | git-repo-e30f46b957c9c192f09a4907e3e7e802c9b782f8.tar.gz | |
Print stderr output from git command for RemoteFetch
The stderr output generated by git during a RemoteFetch was not being
printed. This information is useful so print it.
Change-Id: I6e6ce12c4a57e5ca2359f76ce14f2fcbbc37a5ef
| -rw-r--r-- | project.py | 6 |
1 files changed, 4 insertions, 2 deletions
| @@ -1877,6 +1877,7 @@ class Project(object): | |||
| 1877 | gitcmd = GitCommand(self, cmd, bare=True, capture_stderr=True, | 1877 | gitcmd = GitCommand(self, cmd, bare=True, capture_stderr=True, |
| 1878 | ssh_proxy=ssh_proxy) | 1878 | ssh_proxy=ssh_proxy) |
| 1879 | ret = gitcmd.Wait() | 1879 | ret = gitcmd.Wait() |
| 1880 | print(gitcmd.stderr, file=sys.stderr, end='') | ||
| 1880 | if ret == 0: | 1881 | if ret == 0: |
| 1881 | ok = True | 1882 | ok = True |
| 1882 | break | 1883 | break |
| @@ -1886,8 +1887,9 @@ class Project(object): | |||
| 1886 | "git remote prune" in gitcmd.stderr): | 1887 | "git remote prune" in gitcmd.stderr): |
| 1887 | prunecmd = GitCommand(self, ['remote', 'prune', name], bare=True, | 1888 | prunecmd = GitCommand(self, ['remote', 'prune', name], bare=True, |
| 1888 | capture_stderr=True, ssh_proxy=ssh_proxy) | 1889 | capture_stderr=True, ssh_proxy=ssh_proxy) |
| 1889 | if prunecmd.Wait(): | 1890 | ret = prunecmd.Wait() |
| 1890 | print(prunecmd.stderr, file=sys.stderr) | 1891 | print(prunecmd.stderr, file=sys.stderr, end='') |
| 1892 | if ret: | ||
| 1891 | break | 1893 | break |
| 1892 | continue | 1894 | continue |
| 1893 | elif current_branch_only and is_sha1 and ret == 128: | 1895 | elif current_branch_only and is_sha1 and ret == 128: |
