RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverting .strip() logic and moving the check into the get_password() function.

This commit is contained in:
Anton Hvornum 2021-03-29 10:20:35 +02:00
parent 5e3a152364
commit 36dfa2e1c4
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/user_interaction.py
View File

@ -24,6 +24,10 @@ def get_password(prompt="Enter a password: "):
if passwd != passwd_verification: if passwd != passwd_verification:
log(' * Passwords did not match * ', bg='black', fg='red') log(' * Passwords did not match * ', bg='black', fg='red')
continue continue
if len(passwd.strip()) <= 0:
break
return passwd return passwd
return None return None

2
examples/guided.py
View File

@ -139,7 +139,7 @@ def ask_user_questions():
# Get disk encryption password (or skip if blank) # Get disk encryption password (or skip if blank)
if not archinstall.arguments.get('!encryption-password', None): 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['!encryption-password'] = passwd
archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password'] archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password']