D8004: wix: always normalize version string

Submitter	phabricator
Date	Jan. 25, 2020, 4:34 a.m.
Message ID	<differential-rev-PHID-DREV-z5uum7cpgtszdbnzk2ci-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/44652/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sat, 25 Jan 2020 04:34:49 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D8004: wix: always normalize version string Message-ID: <differential-rev-PHID-DREV-z5uum7cpgtszdbnzk2ci-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-z5uum7cpgtszdbnzk2ci Thread-Index: MTcwODQ2N2RmYzgxNDgxMjY1MjhlNjJlMWZl MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "indygreg \(Gregory Szorc\)" <phabricator+D8004+public+3fafa10f9f628db5@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Jan. 25, 2020, 4:34 a.m.

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Before, it was possible to pass in a custom version string
  which would not be valid in MSI. So we always normalize the
  version string.
  
  While we're here, also print when we normalize the version string,
  for better visibility.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  contrib/packaging/hgpackaging/wix.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
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)

Patchwork D8004: wix: always normalize version string

Comments

Patch