ad4dad059d
- Activate test suite and remove bcond test - Add py37.patch already merged upstream to fix Python 3.7, especially git submodules - Add test_blocking_lock_file-extra-time.patch to avoid an indeterministic timing failure - Add test-skips.patch to skip one expected failure and workaround two unknown failures - Remove test suite from the runtime package - Add doc/source/*.rst to %docs - Remove dependency on python3-mock - Set build dependency ddt minimum version 1.1.1 OBS-URL: https://build.opensuse.org/request/show/685184 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-GitPython?expand=0&rev=20
52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
diff -ur GitPython-2.1.11-orig/git/objects/submodule/base.py GitPython-2.1.11/git/objects/submodule/base.py
|
|
--- GitPython-2.1.11-orig/git/objects/submodule/base.py 2019-03-13 17:12:27.055299102 +0700
|
|
+++ GitPython-2.1.11/git/objects/submodule/base.py 2019-03-13 17:14:33.840773626 +0700
|
|
@@ -1160,7 +1160,7 @@
|
|
try:
|
|
parser = cls._config_parser(repo, pc, read_only=True)
|
|
except IOError:
|
|
- raise StopIteration
|
|
+ return
|
|
# END handle empty iterator
|
|
|
|
rt = pc.tree # root tree
|
|
diff -ur GitPython-2.1.11-orig/git/repo/base.py GitPython-2.1.11/git/repo/base.py
|
|
--- GitPython-2.1.11-orig/git/repo/base.py 2019-03-13 17:12:29.187300315 +0700
|
|
+++ GitPython-2.1.11/git/repo/base.py 2019-03-13 17:14:33.884774474 +0700
|
|
@@ -714,7 +714,10 @@
|
|
|
|
stream = (line for line in data.split(b'\n') if line)
|
|
while True:
|
|
- line = next(stream) # when exhausted, causes a StopIteration, terminating this function
|
|
+ try:
|
|
+ line = next(stream) # when exhausted, causes a StopIteration, terminating this function
|
|
+ except StopIteration:
|
|
+ return
|
|
hexsha, orig_lineno, lineno, num_lines = line.split()
|
|
lineno = int(lineno)
|
|
num_lines = int(num_lines)
|
|
@@ -724,7 +727,10 @@
|
|
# for this commit
|
|
props = {}
|
|
while True:
|
|
- line = next(stream)
|
|
+ try:
|
|
+ line = next(stream)
|
|
+ except StopIteration:
|
|
+ return
|
|
if line == b'boundary':
|
|
# "boundary" indicates a root commit and occurs
|
|
# instead of the "previous" tag
|
|
@@ -749,7 +755,10 @@
|
|
# Discard all lines until we find "filename" which is
|
|
# guaranteed to be the last line
|
|
while True:
|
|
- line = next(stream) # will fail if we reach the EOF unexpectedly
|
|
+ try:
|
|
+ line = next(stream) # will fail if we reach the EOF unexpectedly
|
|
+ except StopIteration:
|
|
+ return
|
|
tag, value = line.split(b' ', 1)
|
|
if tag == b'filename':
|
|
orig_filename = value
|