[ros-diffs] [reactos] 04/09: [WINESYNC] Allow using the "new" Wine-Staging patchinstall.py script.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67ca439d06a8ad7f00cb4…

commit 67ca439d06a8ad7f00cb42ea839c3cadcbec0ea1
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Tue Sep 5 17:59:33 2023 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Dec 18 22:21:36 2023 +0100

    [WINESYNC] Allow using the "new" Wine-Staging patchinstall.py script.
    
    Wine-Staging switched to staging/patchinstall.py , removing the
    deprecated patches/patchinstall.sh in Feb.16, 2023 commit
   
https://github.com/wine-staging/wine-staging/commit/c1b4af92f74d7bd330003d3…
    just before the v8.2 release.
    
    In order to maintain interoperability between older and newer
    Wine-Staging versions, try to run first the new script; if it fails,
    fall back to the older script.
---
 sdk/tools/winesync/winesync.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py
index 652e4233e23..680b4cfc4d6 100644
--- a/sdk/tools/winesync/winesync.py
+++ b/sdk/tools/winesync/winesync.py
@@ -84,7 +84,9 @@ class wine_sync:
             self.wine_staging_repo.reset(wine_staging_target_commit,
pygit2.GIT_RESET_HARD)
 
             # run the wine-staging script
-            subprocess.call(['bash', '-c', self.wine_staging_src +
'/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all
--backend=git-am'])
+            if subprocess.call(['python', self.wine_staging_src +
'/staging/patchinstall.py', 'DESTDIR=' + self.wine_src, '--all',
'--backend=git-am']):
+                # the new script failed (it doesn't exist?), try the old one
+                subprocess.call(['bash', '-c', self.wine_staging_src +
'/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all
--backend=git-am'])
 
             # delete the branch we created
            
self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch('master'))