Skip to content

refactor: do not use automatic format strings #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richm merged 1 commit into from
Nov 17, 2025
Merged

refactor: do not use automatic format strings #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions library/nbde_client_clevis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ def get_luks1_payload_offset(module, device):

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

# Look for "Payload offset:" line
for line in stdout.split("\n"):
Expand All @@ -681,15 +681,15 @@ def backup_luks1_gap_area(module, device, payload_offset_sectors):
# Backup from sector 0 to payload_offset_sectors (everything before encrypted data)
args = [
"dd",
"if={}".format(device),
"count={}".format(payload_offset_sectors),
"if={0}".format(device),
"count={0}".format(payload_offset_sectors),
"bs=512",
"status=none",
]

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

return header_and_gap_data, None

Expand All @@ -705,8 +705,8 @@ def restore_luks1_gap_area(module, device, payload_offset_sectors, header_and_ga
# Restore from sector 0 to payload_offset_sectors (everything before encrypted data)
args = [
"dd",
"of={}".format(device),
"count={}".format(payload_offset_sectors),
"of={0}".format(device),
"count={0}".format(payload_offset_sectors),
"bs=512",
"conv=notrunc",
"status=none",
Expand All @@ -716,7 +716,7 @@ def restore_luks1_gap_area(module, device, payload_offset_sectors, header_and_ga
args, data=header_and_gap_data, binary_data=True
)
if ret_code != 0:
return {"msg": "Failed to restore header and gap area: {}".format(stderr)}
return {"msg": "Failed to restore header and gap area: {0}".format(stderr)}

return None

Expand Down Expand Up @@ -835,7 +835,7 @@ def restore_luks_device(module, device, backup):
]
ret, _unused, stderr = module.run_command(args)
if ret != 0:
return {"msg": "Error during rollback: {}".format(stderr)}
return {"msg": "Error during rollback: {0}".format(stderr)}
return None


Expand Down
Loading