mhameed
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use check_output for git describe execution and define fallback VERSION earlier

This commit is contained in:
ander 2020-10-16 15:41:38 +03:00
parent b41d80075a
commit e55db1b427
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cdist/__init__.py
View File

@ -27,23 +27,21 @@ import subprocess
import cdist.log import cdist.log
VERSION = 'unknown version'
try: try:
import cdist.version import cdist.version
VERSION = cdist.version.VERSION VERSION = cdist.version.VERSION
except ModuleNotFoundError: except ModuleNotFoundError:
cdist_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) cdist_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
if os.path.isdir(os.path.join(cdist_dir, '.git')): if os.path.isdir(os.path.join(cdist_dir, '.git')):
run_git = subprocess.run( try:
['git', 'describe', '--always'], VERSION = subprocess.check_output(
cwd=cdist_dir, ['git', 'describe', '--always'],
capture_output=True, cwd=cdist_dir,
text=True) universal_newlines=True)
if run_git.returncode == 0: except:
VERSION = run_git.stdout pass
else:
VERSION = 'from git'
else:
VERSION = 'unknown version'
BANNER = """ BANNER = """
.. . .x+=:. s .. . .x+=:. s