Skip to content

Commit da947b9

Browse files
committed
system: Guard rOS version check
Apparently this directory sometimes doesn't exist (with ancient rOS versions?). Signed-off-by: Hector Martin <[email protected]>
1 parent c3fdd15 commit da947b9

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

src/system.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,19 @@ def fetch(self):
8383
self.login_user = consoleuser
8484

8585
self.sros_full_ver = "0"
86-
self.sros_ver = None
87-
self.sros_build = None
86+
self.sros_ver = "0"
87+
self.sros_build = "(unknown)"
8888

8989
base = "/System/Volumes/iSCPreboot/SystemRecovery"
90-
for p in os.listdir(base):
91-
try:
92-
v = self.get_restore_version(os.path.join(base, p, "RestoreVersion.plist"))
93-
except Exception:
94-
continue
95-
if split_ver(v) > split_ver(self.sros_full_ver):
96-
self.sros_full_ver = v
97-
self.sros_ver, self.sros_build = self.get_version(os.path.join(base, p, "SystemVersion.plist"))
90+
if os.path.exists(base):
91+
for p in os.listdir(base):
92+
try:
93+
v = self.get_restore_version(os.path.join(base, p, "RestoreVersion.plist"))
94+
except Exception:
95+
continue
96+
if split_ver(v) > split_ver(self.sros_full_ver):
97+
self.sros_full_ver = v
98+
self.sros_ver, self.sros_build = self.get_version(os.path.join(base, p, "SystemVersion.plist"))
9899

99100
def get_nvram_data(self):
100101
nvram_data = subprocess.run(["nvram", "-p"],

0 commit comments

Comments
 (0)