almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

Include exact version of pungi in the logs

Browse Source 
Fixes #990

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2018-07-26 17:03:58 -04:00
parent 4ecf75295a
commit 80c3fd1170
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pungi/__init__.py
View File

@ -25,8 +25,10 @@ def get_full_version():
output, _ = proc.communicate() output, _ = proc.communicate()
return re.sub(r'-1.fc\d\d?', '', output.strip().replace('pungi-', '')) return re.sub(r'-1.fc\d\d?', '', output.strip().replace('pungi-', ''))
else: else:
import pkg_resources import subprocess
try: proc = subprocess.Popen(["rpm", "-q", "pungi"], stdout=subprocess.PIPE)
return pkg_resources.get_distribution('pungi').version (output, err) = proc.communicate()
except pkg_resources.DistributionNotFound: if not err:
return output.rstrip()
else:
return 'unknown' return 'unknown'