mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-24 09:13:37 +02:00
App.__os_release(): Use ExecContext.get()
The property App.__os_release uses _run(['cat', '/etc/os-release']), use ExecContext.get() instead as the default way to fetch content. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
60630676ef
commit
d803c66f70
1 changed files with 2 additions and 8 deletions
|
|
@ -308,14 +308,8 @@ class App(Base):
|
||||||
if self.__os_release is None:
|
if self.__os_release is None:
|
||||||
release_file = '/etc/os-release'
|
release_file = '/etc/os-release'
|
||||||
try:
|
try:
|
||||||
result = self.call_async(
|
result = self.call_async(self.exec_context.get(release_file, throw=True))
|
||||||
self.exec_context.run(
|
self.__os_release = result.stdout.decode().strip()
|
||||||
['/usr/bin/cat', release_file],
|
|
||||||
throw=True,
|
|
||||||
cmd_input=InputMode.NonInteractive
|
|
||||||
)
|
|
||||||
)
|
|
||||||
self.__os_release = result.decode().stdout.strip()
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log(INFO, f'Failed to read {release_file} ({str(e)}), falling back to uname')
|
log(INFO, f'Failed to read {release_file} ({str(e)}), falling back to uname')
|
||||||
result = self.call_async(
|
result = self.call_async(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue