From 84e8921e322d27d7ea9765264c29ebdbc3919dae Mon Sep 17 00:00:00 2001 From: Ramy Asselin Date: Thu, 22 Jan 2015 08:49:01 -0800 Subject: Zuul sometimes fails to update remotes Sometimes, even after cloning a new repository, zuul will fail to merge the change with a stack trace shown below. I was using GitPython==0.3.2.1. Upgrading it to >= 0.3.3 resolves the issue. 2015-01-22 08:27:48,222 ERROR zuul.Merger: Exception while merging a change: Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 234, in _mergeChange commit = repo.merge(item['refspec'], 'resolve') File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 132, in merge self.fetch(ref) File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 145, in fetch origin.fetch(ref) File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 598, in fetch return self._get_fetch_info_from_stderr(proc, progress or RemoteProgress()) File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 540, in _get_fetch_info_from_stderr for err_line, fetch_line in zip(fetch_info_lines, fetch_head_info)) File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 540, in for err_line, fetch_line in zip(fetch_info_lines, fetch_head_info)) File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 252, in _from_line raise ValueError("Failed to parse line: %r" % line) ValueError: Failed to parse line: 'Total 7 (delta 0), reused 7 (delta 0)' This is the more specific GitPython Commit that resolves the issue: https://github.com/gitpython-developers/GitPython/commit/d48ed95cc7bd2ad0ac36593bb2440f24f675eb59 Closes-Bug: #2000130 Change-Id: I1992b492e8c80322cc6ae01f6e2ebc181a9de813 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ba3fff920..f5525b60f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ PyYAML>=3.1.0 Paste WebOb>=1.2.3,<1.3 paramiko>=1.8.0 -GitPython>=0.3.2.1 +GitPython>=0.3.3 ordereddict python-daemon>=2.0.4 extras -- cgit v1.2.1