wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

patchupdate.py: Implement 'IfDefined' patch property to autogenerate corresponding patch.

Browse Source
This commit is contained in:
Sebastian Lackner
2014-12-14 06:03:05 +01:00
parent c0f9ca2ab5
commit 48a7480fc5
3 changed files with 112 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/tools/patchutils.py vendored
View File

@@ -385,7 +385,7 @@ def generate_ifdef_patch(original, patched, ifdef):
lines = []
original.seek(0)
for line in original:
lines.append(line.rstrip("\r\n"))
lines.append(line.rstrip("\n"))
split = set([0])
state = 0
@@ -510,7 +510,7 @@ def generate_ifdef_patch(original, patched, ifdef):
try:
while srclines > 0 or dstlines > 0:
line = diff.readline().rstrip("\r\n")
line = diff.readline().rstrip("\n")
if line[0] == " ":
if srclines == 0 or dstlines == 0:
raise PatchParserError("Corrupted patch.")