dist: get Ubuntu version from dpkg-parsechangelog
This commit is contained in:
parent
0692dd1911
commit
9b868c8869
11
setup.py
11
setup.py
|
@ -16,7 +16,6 @@ with open('lib/solaar/version', 'r') as vfile:
|
|||
|
||||
try: # get commit from git describe
|
||||
commit = subprocess.check_output(['git', 'describe', '--always'], stderr=subprocess.DEVNULL).strip().decode()
|
||||
print('GIT', commit)
|
||||
with open('lib/solaar/commit', 'w') as vfile:
|
||||
vfile.write(f'{commit}\n')
|
||||
except Exception: # get commit from Ubuntu dpkg-parsechangelog
|
||||
|
@ -24,14 +23,14 @@ except Exception: # get commit from Ubuntu dpkg-parsechangelog
|
|||
dpkg = subprocess.check_output(['dpkg-parsechangelog'], stderr=subprocess.DEVNULL).strip().decode()
|
||||
print(dpkg)
|
||||
match = re.search(r'\nVersion: (.*)~', dpkg)
|
||||
print(match.group(1))
|
||||
print('VERSION', match.group(0), match.group(1))
|
||||
with open('lib/solaar/commit', 'w') as vfile:
|
||||
vfile.write(f'{match.group[1]}\n')
|
||||
print(
|
||||
'DPKG VERSION',
|
||||
subprocess.check_output(['dpkg-parsechangelog', '--show-field', 'Version'],
|
||||
commit = subprocess.check_output(['dpkg-parsechangelog', '--show-field', 'Version'],
|
||||
stderr=subprocess.DEVNULL).strip().decode()
|
||||
)
|
||||
print('DPKG VERSION', commit)
|
||||
# with open('lib/solaar/commit', 'w') as vfile:
|
||||
# vfile.write(f'{commit]}\n')
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
|
Loading…
Reference in New Issue