Skip to content

Commit 6d9d0e1

Browse files
committed
os.py: rename get_os_release_codename() to get_os_release_info()
and have it return a dictionary of os-release file's contents. Some users need to query versions also.
1 parent 1f94a50 commit 6d9d0e1

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

xapp/os.py

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,22 @@ def run_with_admin_privs(command, message=None, icon=None, support_pkexec=False)
127127
else:
128128
return False
129129

130-
def get_os_release_codename():
130+
def get_os_release_info():
131131
try:
132-
os_release = {}
133-
with open("/etc/os-release") as f:
132+
with open("/etc/os-release", encoding="utf-8") as f:
134133
reader = csv.reader(f, delimiter="=")
135-
os_release = dict(reader)
136-
137-
return os_release["VERSION_CODENAME"]
134+
return dict(reader)
138135
except Exception as e:
139-
print("Unable to retrieve codename from /etc/os-release: %s" % str(e))
140-
141-
return None
136+
print("Unable to retrieve /etc/os-release: %s" % str(e))
137+
138+
return {
139+
"NAME" : "unknown",
140+
"VERSION" : "unknown",
141+
"ID" : "unknown",
142+
"ID_LIKE" : "unknown",
143+
"PRETTY_NAME" : "unknown",
144+
"VERSION_ID" : "unknown",
145+
"VERSION_CODENAME": "unknown",
146+
"UBUNTU_CODENAME" : "unknown",
147+
"DEBIAN_CODENAME" : "unknown"
148+
}

0 commit comments

Comments
 (0)