84e8921e32
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 <genexpr>
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:
d48ed95cc7
Closes-Bug: #2000130
Change-Id: I1992b492e8c80322cc6ae01f6e2ebc181a9de813
19 lines
260 B
Plaintext
19 lines
260 B
Plaintext
pbr>=0.5.21,<1.0
|
|
|
|
argparse
|
|
PyYAML>=3.1.0
|
|
Paste
|
|
WebOb>=1.2.3,<1.3
|
|
paramiko>=1.8.0
|
|
GitPython>=0.3.3
|
|
ordereddict
|
|
python-daemon>=2.0.4
|
|
extras
|
|
statsd>=1.0.0,<3.0
|
|
voluptuous>=0.7
|
|
gear>=0.5.4,<1.0.0
|
|
apscheduler>=2.1.1,<3.0
|
|
PrettyTable>=0.6,<0.8
|
|
babel>=1.0
|
|
six>=1.6.0
|