Mercurial > hg-stable
comparison contrib/packaging/hgpackaging/cli.py @ 47866:39ab4c2f38b4 stable
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
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 25 Aug 2021 19:33:25 -0700 |
| parents | be37bb8d0c7c |
| children | 17d5e25b8e78 |
comparison
equal
deleted
inserted
replaced
| 47865:769cd5703b2c | 47866:39ab4c2f38b4 |
|---|---|
| 78 } | 78 } |
| 79 | 79 |
| 80 if pyoxidizer_target: | 80 if pyoxidizer_target: |
| 81 fn = wix.build_installer_pyoxidizer | 81 fn = wix.build_installer_pyoxidizer |
| 82 kwargs["target_triple"] = pyoxidizer_target | 82 kwargs["target_triple"] = pyoxidizer_target |
| 83 kwargs["extra_pyoxidizer_vars"] = extra_pyoxidizer_vars | |
| 83 else: | 84 else: |
| 84 fn = wix.build_installer_py2exe | 85 fn = wix.build_installer_py2exe |
| 85 kwargs["python_exe"] = pathlib.Path(python) | 86 kwargs["python_exe"] = pathlib.Path(python) |
| 86 | 87 |
| 87 if extra_packages_script: | 88 if extra_packages_script: |
| 104 "cert_path": sign_cert, | 105 "cert_path": sign_cert, |
| 105 "cert_password": sign_password, | 106 "cert_password": sign_password, |
| 106 "timestamp_url": sign_timestamp_url, | 107 "timestamp_url": sign_timestamp_url, |
| 107 } | 108 } |
| 108 | 109 |
| 109 fn(**kwargs, extra_pyoxidizer_vars=extra_pyoxidizer_vars) | 110 fn(**kwargs) |
| 110 | 111 |
| 111 | 112 |
| 112 def get_parser(): | 113 def get_parser(): |
| 113 parser = argparse.ArgumentParser() | 114 parser = argparse.ArgumentParser() |
| 114 | 115 |