[gentoo-commits] proj/catalyst:master commit in: catalyst/

[Brian Dolbec]

commit:     83d1bd1a2b01e3b89caca3ff48e4308176c208f0
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 16:10:36 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 16:10:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=83d1bd1a

version.py: Copy what was needed of the old format_version code to fix versioning

The new get_version code from snakeoil is not compatible with teh rest of
the catlyst code.  It will need a lot more conversion to use the new system.
I do think it could be better once completed.

 catalyst/version.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/catalyst/version.py b/catalyst/version.py
index 8c0b267..c274a11 100644
--- a/catalyst/version.py
+++ b/catalyst/version.py
@@ -10,16 +10,28 @@
 
 import os
 
-from snakeoil.version import get_version as get_ver
+from snakeoil.version import get_git_version as get_ver
 
-__version__="rewrite-git"
+__version__="git"
 _ver = None
 
 
 def get_git_version(version=__version__):
 	"""Return: a string describing our version."""
 	global _ver
-	_ver = get_ver('catalyst-%s' % version, __file__)
+	cwd = os.path.dirname(os.path.abspath(__file__))
+	version_info = get_ver(cwd)
+
+	if not version_info:
+		s = "extended version info unavailable"
+	elif version_info['tag'] == api_version:
+		s = 'released %s' % (version_info['date'],)
+	else:
+		s = ('vcs version %s, date %s' %
+			 (version_info['rev'], version_info['date']))
+
+	_ver = '%s %s\n%s' % (project, api_version, s)
+
 	return _ver