Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-03-29 10:20:35 +0200
committerAnton Hvornum <anton@hvornum.se>2021-03-29 10:20:35 +0200
commit36dfa2e1c42add691243850b62b705b26a0a796c (patch)
treea1a91720a42e05209297f6485bcc01566eb45758
parent5e3a1523644abe3dc0c06ff17dbaeafb5a3cbda4 (diff)
Reverting .strip() logic and moving the check into the get_password() function.
-rw-r--r--archinstall/lib/user_interaction.py4
-rw-r--r--examples/guided.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index a79b4847..bee7b569 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -24,6 +24,10 @@ def get_password(prompt="Enter a password: "):
if passwd != passwd_verification:
log(' * Passwords did not match * ', bg='black', fg='red')
continue
+
+ if len(passwd.strip()) <= 0:
+ break
+
return passwd
return None
diff --git a/examples/guided.py b/examples/guided.py
index 009f9fa6..92331450 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -139,7 +139,7 @@ def ask_user_questions():
# Get disk encryption password (or skip if blank)
if not archinstall.arguments.get('!encryption-password', None):
- if (passwd := archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ')).strip():
+ if (passwd := archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ')):
archinstall.arguments['!encryption-password'] = passwd
archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password']