Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk/validators.py
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2022-09-30 17:25:43 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2022-09-30 17:25:43 +0200
commit6408c9dce00aa70ad3c6614d2d793dba9a99aff6 (patch)
treebff1889dfebde0c74e30e9de427a2c122513684b /archinstall/lib/disk/validators.py
parentfaf925de1882be722d2994d697a802918282e509 (diff)
parent53a2797af6ac0832bf7dd00dfe96b8ea1867db2e (diff)
merged from upstream for ISO 2022-10
Diffstat (limited to 'archinstall/lib/disk/validators.py')
-rw-r--r--archinstall/lib/disk/validators.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/archinstall/lib/disk/validators.py b/archinstall/lib/disk/validators.py
index fd1b7f33..54808886 100644
--- a/archinstall/lib/disk/validators.py
+++ b/archinstall/lib/disk/validators.py
@@ -7,13 +7,11 @@ def valid_parted_position(pos :str) -> bool:
if pos.isdigit():
return True
- if pos[-1] == '%' and pos[:-1].isdigit():
+ if pos.lower().endswith('b') and pos[:-1].isdigit():
return True
- if pos[-3:].lower() in ['mib', 'kib', 'b', 'tib'] and pos[:-3].replace(".", "", 1).isdigit():
- return True
-
- if pos[-2:].lower() in ['kb', 'mb', 'gb', 'tb'] and pos[:-2].replace(".", "", 1).isdigit():
+ if any(pos.lower().endswith(size) and pos[:-len(size)].replace(".", "", 1).isdigit()
+ for size in ['%', 'kb', 'mb', 'gb', 'tb', 'kib', 'mib', 'gib', 'tib']):
return True
return False