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

Rebase against upstream commit 79a0dece8b2a27979835076914a21f468515d8b6, remove several patches accepted upstream.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-01-16 05:05:54 +01:00
parent 3e7445275a
commit 8692907421
35 changed files with 383 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debian/tools/patchupdate.py vendored
View File

@@ -146,11 +146,12 @@ def _stable_compholio_version():
if distro.lower() != "unreleased":
return version
def _latest_wine_commit():
def _latest_wine_commit(commit=None):
"""Get latest wine commit."""
if not os.path.isdir(config.path_wine):
raise PatchUpdaterError("Please create a symlink to the wine repository in %s" % config.path_wine)
commit = subprocess.check_output(["git", "rev-parse", "origin/master"], cwd=config.path_wine).strip()
if commit is None:
commit = subprocess.check_output(["git", "rev-parse", "origin/master"], cwd=config.path_wine).strip()
assert len(commit) == 40
return commit
@@ -650,7 +651,7 @@ if __name__ == "__main__":
try:
# Get information about Wine and Compholio version
latest_wine_commit = _latest_wine_commit()
latest_wine_commit = _latest_wine_commit(sys.argv[1] if len(sys.argv) >= 2 else None)
stable_compholio_version = _stable_compholio_version()
# Read current and stable patches