Patchwork D8005: wix: use original version string for MSI filename

login
register
mail settings
Submitter phabricator
Date Jan. 26, 2020, 12:02 a.m.
Message ID <6040927ef8be41b055507e4a303f645f@localhost.localdomain>
Download mbox | patch
Permalink /patch/44662/
State Not Applicable
Headers show

Comments

phabricator - Jan. 26, 2020, 12:02 a.m.
Closed by commit rHG62111bc5ff87: wix: use original version string for MSI filename (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/D8005?vs=19597&id=19611

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

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

AFFECTED FILES
  contrib/packaging/hgpackaging/wix.py

CHANGE DETAILS




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

Patch

diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py
--- a/contrib/packaging/hgpackaging/wix.py
+++ b/contrib/packaging/hgpackaging/wix.py
@@ -475,7 +475,7 @@ 
     run_candle(wix_path, build_dir, source, source_build_rel, defines=defines)
 
     msi_path = (
-        source_dir / 'dist' / ('%s-%s-%s.msi' % (msi_name, version, arch))
+        source_dir / 'dist' / ('%s-%s-%s.msi' % (msi_name, orig_version, arch))
     )
 
     args = [