Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-05-18 07:24:24 +0000
committerGitHub <noreply@github.com>2021-05-18 07:24:24 +0000
commit5b3e1076ae0a699142c73e1c0e9c1df6c867163a (patch)
tree36ef43fc0797710c01b2aebe48e972fcf5bc4256 /archinstall/lib
parentd0bc166e7e9f381be15791ebd1d0150ba17a66c0 (diff)
parentfb8bb98b83f884cc61bf3a0e77a95ce10c5d6ead (diff)
Merge pull request #469 from archlinux/torxed-fix-467
Incorrect variable names being used from copy paste.
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/luks.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
index 6fab9b94..b910bfb2 100644
--- a/archinstall/lib/luks.py
+++ b/archinstall/lib/luks.py
@@ -43,7 +43,7 @@ class luks2:
def encrypt(self, partition, password=None, key_size=512, hash_type='sha512', iter_time=10000, key_file=None):
if not self.partition.allow_formatting:
- raise DiskError(f'Could not encrypt volume {self.partition} due to it having a formatting lock.')
+ raise DiskError(f'Could not encrypt volume {partition} due to it having a formatting lock.')
log(f'Encrypting {partition} (This might take a while)', level=logging.INFO)
@@ -107,7 +107,7 @@ class luks2:
raise err
if cmd_handle.exit_code != 0:
- raise DiskError(f'Could not encrypt volume "{partition.path}": {cmd_output}')
+ raise DiskError(f'Could not encrypt volume "{partition.path}": {b"".join(cmd_handle)}')
return key_file