Changeset f0bb84bac2f3…
Parent 1c79d85d9d4c…
by
Changes to 2 files · Browse files at f0bb84bac2f3 Showing diff from parent 1c79d85d9d4c Diff from another changeset...
@@ -183,7 +183,7 @@
if os.path.isdir('.hg'):
from tortoisehg.util import version as _version
- version = _version.liveversion()
+ branch, version = _version.liveversion()
if version.endswith('+'):
version += time.strftime('%Y%m%d')
elif os.path.exists('.hg_archival.txt'):
@@ -213,7 +213,8 @@ desc = 'Windows shell extension for Mercurial VCS'
# Windows binary file versions for exe/dll files must have the
# form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535
- setupversion = version.split('+', 1)[0]
+ from tortoisehg.util.version import package_version
+ setupversion = package_version()
productname = 'TortoiseHg'
else:
(scripts, packages, data_files, extra) = setup_posix()
|
Loading...