Patchwork D8004: wix: always normalize version string

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

Comments

phabricator - Jan. 26, 2020, 12:02 a.m.
Closed by commit rHG2251b6cde170: wix: always normalize version string (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/D8004?vs=19596&id=19610

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

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

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
@@ -411,8 +411,11 @@ 
         extra_packages_script=extra_packages_script,
     )
 
-    version = version or normalize_version(find_version(source_dir))
+    orig_version = version or find_version(source_dir)
+    version = normalize_version(orig_version)
     print('using version string: %s' % version)
+    if version != orig_version:
+        print('(normalized from: %s)' % orig_version)
 
     if post_build_fn:
         post_build_fn(source_dir, hg_build_dir, dist_dir, version)