Skip to content

Commit 3a35853

Browse files
committed
Revert "os.py: rename get_os_release_codename() to get_os_release_info()"
This reverts commit 6d9d0e1. It was only used in mintupdate/mintsources. Both no longer use it.
1 parent 6d9d0e1 commit 3a35853

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

xapp/os.py

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

130-
def get_os_release_info():
130+
def get_os_release_codename():
131131
try:
132-
with open("/etc/os-release", encoding="utf-8") as f:
132+
os_release = {}
133+
with open("/etc/os-release") as f:
133134
reader = csv.reader(f, delimiter="=")
134-
return dict(reader)
135+
os_release = dict(reader)
136+
137+
return os_release["VERSION_CODENAME"]
135138
except Exception as e:
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-
}
139+
print("Unable to retrieve codename from /etc/os-release: %s" % str(e))
140+
141+
return None

0 commit comments

Comments
 (0)