Skip to content

Use dpkg-query for pkg version #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sastraxi wants to merge 1 commit into
base: pistomp-v3
Choose a base branch
from
Open

Use dpkg-query for pkg version #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion modalapi/mod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,12 @@ def system_info_load(self):
self.git_describe = output.decode()
self.software_version = self.git_describe.split('-')[0]
except subprocess.CalledProcessError:
logging.error("Cannot obtain git software tag info")
try:
output = subprocess.check_output(['dpkg-query', '--showformat=${Version}', '--show', 'pi-stomp'])
self.git_describe = output.decode().strip()
self.software_version = self.git_describe
except subprocess.CalledProcessError:
logging.error("Cannot obtain software version info")

self.eq_status = self.audiocard.get_switch_parameter(self.audiocard.DAC_EQ)
self.lcd.update_eq(self.eq_status)
Expand Down
7 changes: 6 additions & 1 deletion modalapi/modhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,12 @@ def system_info_load(self):
self.software_version = output.decode()
logging.info("pi-Stomp Software Version: %s" % self.software_version)
except subprocess.CalledProcessError:
logging.error("Cannot obtain git software tag info")
try:
output = subprocess.check_output(['dpkg-query', '--showformat=${Version}', '--show', 'pi-stomp'])
self.software_version = output.decode().strip()
logging.info("pi-Stomp Software Version (pkg): %s" % self.software_version)
except subprocess.CalledProcessError:
logging.error("Cannot obtain software version info")

try:
if Path(self.build_file).exists():
Expand Down