Skip to content

Commit 3970b1a

Browse files
committed
refactor: do not use automatic format strings
pylint does not like automatic format strings - might be problematic on some older platforms with older versions of python Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 6882f7c commit 3970b1a

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

library/nbde_client_clevis.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ def get_luks1_payload_offset(module, device):
660660

661661
ret_code, stdout, stderr = module.run_command(["cryptsetup", "luksDump", device])
662662
if ret_code != 0:
663-
return None, {"msg": "Failed to dump LUKS info: {}".format(stderr)}
663+
return None, {"msg": "Failed to dump LUKS info: {0}".format(stderr)}
664664

665665
# Look for "Payload offset:" line
666666
for line in stdout.split("\n"):
@@ -681,15 +681,15 @@ def backup_luks1_gap_area(module, device, payload_offset_sectors):
681681
# Backup from sector 0 to payload_offset_sectors (everything before encrypted data)
682682
args = [
683683
"dd",
684-
"if={}".format(device),
685-
"count={}".format(payload_offset_sectors),
684+
"if={0}".format(device),
685+
"count={0}".format(payload_offset_sectors),
686686
"bs=512",
687687
"status=none",
688688
]
689689

690690
ret_code, header_and_gap_data, stderr = module.run_command(args, binary_data=True)
691691
if ret_code != 0:
692-
return None, {"msg": "Failed to backup header and gap area: {}".format(stderr)}
692+
return None, {"msg": "Failed to backup header and gap area: {0}".format(stderr)}
693693

694694
return header_and_gap_data, None
695695

@@ -705,8 +705,8 @@ def restore_luks1_gap_area(module, device, payload_offset_sectors, header_and_ga
705705
# Restore from sector 0 to payload_offset_sectors (everything before encrypted data)
706706
args = [
707707
"dd",
708-
"of={}".format(device),
709-
"count={}".format(payload_offset_sectors),
708+
"of={0}".format(device),
709+
"count={0}".format(payload_offset_sectors),
710710
"bs=512",
711711
"conv=notrunc",
712712
"status=none",
@@ -716,7 +716,7 @@ def restore_luks1_gap_area(module, device, payload_offset_sectors, header_and_ga
716716
args, data=header_and_gap_data, binary_data=True
717717
)
718718
if ret_code != 0:
719-
return {"msg": "Failed to restore header and gap area: {}".format(stderr)}
719+
return {"msg": "Failed to restore header and gap area: {0}".format(stderr)}
720720

721721
return None
722722

@@ -835,7 +835,7 @@ def restore_luks_device(module, device, backup):
835835
]
836836
ret, _unused, stderr = module.run_command(args)
837837
if ret != 0:
838-
return {"msg": "Error during rollback: {}".format(stderr)}
838+
return {"msg": "Error during rollback: {0}".format(stderr)}
839839
return None
840840

841841

0 commit comments

Comments
 (0)