packaging: pass extra_pyoxidizer_vars only to pyoxidizer stable
authorGregory Szorc <gregory.szorc@gmail.com>
Wed, 25 Aug 2021 19:33:25 -0700
branchstable
changeset 47881 39ab4c2f38b4
parent 47880 769cd5703b2c
child 47882 1e6cb23ce6da
packaging: pass extra_pyoxidizer_vars only to pyoxidizer 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. Differential Revision: https://phab.mercurial-scm.org/D11355
contrib/packaging/hgpackaging/cli.py
--- a/contrib/packaging/hgpackaging/cli.py	Thu Aug 26 11:04:14 2021 -0400
+++ b/contrib/packaging/hgpackaging/cli.py	Wed Aug 25 19:33:25 2021 -0700
@@ -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():