Skip to content

Commit 68c048c

Browse files
author
James Reynolds
committed
Fixed version check
1 parent d92ed73 commit 68c048c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

jamf/version.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ def string():
2626
def jamf_version_up_to(min_version):
2727
full_version = string()
2828
try:
29-
m = re.match(r"^([0-9]+)\.([0-9]+)\.([0-9]+)", full_version)
30-
min1, min2, min3 = min_version.split(".")
31-
if ( int(m.group(1)) >= int(min1) and
32-
int(m.group(2)) >= int(min2) and
33-
int(m.group(3)) >= int(min3)):
29+
m = re.match(r"^([0-9]+\.[0-9]+\.[0-9]+)", full_version)
30+
min1 = tuple(map(int, (min_version.split("."))))
31+
cur = tuple(map(int, (m.group(1).split("."))))
32+
if (min1 <= cur):
3433
return min_version # Pass
3534
except AttributeError:
3635
return full_version # Fail

0 commit comments

Comments
 (0)