Skip to content

Commit

Permalink
change wording
Browse files Browse the repository at this point in the history
  • Loading branch information
abbbi committed Oct 14, 2024
1 parent 4767290 commit a87f7b2
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions libqmpbackup/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ def _check(image):
log.info(check_cmd)
subprocess.check_output(check_cmd, shell=True)
except subprocess.CalledProcessError as errmsg:
raise RuntimeError(
f"Error during consistentcy check check: {errmsg}"
) from errmsg
raise RuntimeError(f"Error during consistency check: {errmsg}") from errmsg


def merge(argv):
Expand Down Expand Up @@ -215,11 +213,11 @@ def merge(argv):
subprocess.check_output(commit_cmd, shell=True)
if image != argv.targetfile:
log.info(
"Remove temporary file after merge: [%s]",
"Removing temporary file after merge: [%s]",
os.path.join(targetdir, os.path.basename(image)),
)
except subprocess.CalledProcessError as errmsg:
log.error("Error while rollback: %s", errmsg)
log.error("Error during rebase: %s", errmsg)
return False

return True
Expand Down

0 comments on commit a87f7b2

Please sign in to comment.