Patchwork D11355: packaging: pass extra_pyoxidizer_vars only to pyoxidizer

login
register
mail settings
Submitter phabricator
Date Aug. 27, 2021, 5:37 a.m.
Message ID <differential-rev-PHID-DREV-wezvc3dumzben3ztro2m-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49670/
State Superseded
Headers show

Comments

phabricator - Aug. 27, 2021, 5:37 a.m.
indygreg created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Before, we would attempt to call a function (build_installer_py2exe)
  that didn't accept this keyword argument. This was preventing the
  building of py2exe installers.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11355

AFFECTED FILES
  contrib/packaging/hgpackaging/cli.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/packaging/hgpackaging/cli.py b/contrib/packaging/hgpackaging/cli.py
--- a/contrib/packaging/hgpackaging/cli.py
+++ b/contrib/packaging/hgpackaging/cli.py
@@ -80,6 +80,7 @@ 
     if pyoxidizer_target:
         fn = wix.build_installer_pyoxidizer
         kwargs["target_triple"] = pyoxidizer_target
+        kwargs["extra_pyoxidizer_vars"] = extra_pyoxidizer_vars
     else:
         fn = wix.build_installer_py2exe
         kwargs["python_exe"] = pathlib.Path(python)
@@ -106,7 +107,7 @@ 
             "timestamp_url": sign_timestamp_url,
         }
 
-    fn(**kwargs, extra_pyoxidizer_vars=extra_pyoxidizer_vars)
+    fn(**kwargs)
 
 
 def get_parser():