diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e8ff5a6b..48058eba 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "b6c7b2d322e0cd61eaeaac0d936dfc78c850f61b" + echo "e6fc86e4a0a8396a345ae21fbe7be9210441d307" } # Show version information @@ -2680,9 +2680,6 @@ fi # Patchset api-ms-win-Stub_DLLs # | -# | This patchset fixes the following Wine bugs: -# | * [#40451] Add feclient dll -# | # | Modified files: # | * configure.ac, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext- # | ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-xaml- diff --git a/staging/patchupdate.py b/staging/patchupdate.py index 900d89bc..a3de152d 100755 --- a/staging/patchupdate.py +++ b/staging/patchupdate.py @@ -433,9 +433,7 @@ def check_bug_status(all_patches, sync_bugs=False): sync_bug_status(bugtracker, bug, url_map[bug['id']]) patchset = bug['cf_staged_patchset'] if '.patch' in patchset: patchset = patchset[0:patchset.rindex('/')].replace('/blob/','/tree/') - if bug['status'] == 'STAGED' and \ - patchset != url_map[bug['id']] and \ - patchset != url_map[bug['id']].replace('github.com/wine-staging','github.com/wine-compholio'): + if bug['status'] == 'STAGED' and patchset != url_map[bug['id']]: print 'Invalid staged patchset: #%d - \"%s\" - %s' %(bug['id'], bug['summary'], bug['cf_staged_patchset']) once = True