wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

patchupdate.py: Return boolean from test_apply function.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-10-05 21:31:13 +02:00
parent 2dc572f110
commit 4fe40942a6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/tools/patchupdate.py vendored
View File

@ -655,22 +655,21 @@ def generate_script(all_patches, skip_checks=False):
for i, patch1 in set_apply:
for j, patch2 in set_skip:
if causal_time_smaller(patch2.verify_time, patch1.verify_time):
return None # we can skip this test
return True # we can skip this test
try:
original = original_content
for i, _ in set_apply:
original = patchutils.apply_patch(original, selected_patches[i][1], fuzz=0)
except patchutils.PatchApplyError:
return current
return False
return None # everything is fine
return True # everything is fine
def test_apply_seq(current_list):
for current in current_list:
failed = test_apply(current)
if failed is not None:
return failed
if not test_apply(current):
return current
return None
iterables = []