[Updated] D11355: packaging: pass extra_pyoxidizer_vars only to pyoxidizer

[indygreg (Gregory Szorc)]

Closed by commit rHG39ab4c2f38b4: packaging: pass extra_pyoxidizer_vars only to pyoxidizer (authored by indygreg).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11355?vs=30071&id=30077

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11355/new/

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

AFFECTED FILES
  contrib/packaging/hgpackaging/cli.py

CHANGE DETAILS

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():



To: indygreg, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210827/cb4071ec/attachment-0002.html>