Merge branch 'git-version' of https://github.com/evax/cdist

Conflicts:
	lib/cdist/__init__.py

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-05-22 15:35:11 +02:00
commit 9b809ce9a2

View file

@ -19,7 +19,17 @@
#
#
VERSION = "2.0.10"
import os
import subprocess
try:
with open(os.devnull, 'w') as devnull:
here = os.path.dirname(os.path.realpath(__file__))
VERSION = subprocess.check_output(
'cd "%s" && git describe' % here,
stderr=devnull, shell=True).decode('utf-8')
except:
VERSION = "2.0.10"
BANNER = """
.. . .x+=:. s
@ -38,8 +48,6 @@ BANNER = """
DOT_CDIST = ".cdist"
import os
class Error(Exception):
"""Base exception class for this project"""
pass