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: Improve code-generation for dependency resolver.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-01-07 23:06:07 +01:00
parent fe43f3ddc6
commit ac1ffc70f8
2 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
debian/tools/patchupdate.py vendored
View File

@@ -521,10 +521,12 @@ def generate_script(all_patches):
for i, patch in [(i, all_patches[i]) for i in reversed(resolved)]:
if len(patch.depends):
lines.append("if [ \"$%s\" -eq 1 ]; then\n" % patch.variable)
for j in patch.depends:
lines.append("\t[ \"$%s\" -gt 1 ] && abort \"ERROR: Patchset %s disabled, but %s depends on that.\" >&2\n" %
(all_patches[j].variable, all_patches[j].name, patch.name))
for j in patch.depends:
for j in sorted(patch.depends):
lines.append("\tif [ \"$%s\" -gt 1 ]; then\n" % all_patches[j].variable)
lines.append("\t\tabort \"Patchset %s disabled, but %s depends on that.\"\n" %
(all_patches[j].name, patch.name))
lines.append("\tfi\n")
for j in sorted(patch.depends):
lines.append("\t%s=1\n" % all_patches[j].variable)
lines.append("fi\n\n")
lines_resolver = lines
@@ -553,8 +555,8 @@ def generate_script(all_patches):
if len(patch.patches):
lines.append("\t(\n")
for p in _unique(patch.patches, key=lambda p: (p.patch_author, p.patch_subject, p.patch_revision)):
lines.append("\t\techo '+ { \"%s\", \"%s\", %d },';\n" % \
(_escape(p.patch_author), _escape(p.patch_subject), p.patch_revision))
lines.append("\t\techo '+ { \"%s\", \"%s\", %d },';\n" %
(_escape(p.patch_author), _escape(p.patch_subject), p.patch_revision))
lines.append("\t) >> \"$patchlist\"\n")
lines.append("fi\n\n")
lines_apply = lines