Formatting changes

src/borg/crypto/key.py

@@ -364,22 +364,19 @@ def detect(cls, repository, manifest_data):
         target = key.find_key()
         prompt = "Enter passphrase for key %s: " % target
         passphrase = Passphrase.env_passphrase()
-        debug_enabled = os.environ.get("BORG_DEBUG_PASSPHRASE") == "YES"
         if passphrase is None:
             passphrase = Passphrase()
             if not key.load(target, passphrase):
                 for retry in range(0, 3):
                     passphrase = Passphrase.getpass(prompt)
                     if key.load(target, passphrase):
                         break
-                    elif debug_enabled:
-                        Passphrase.display_debug_info(passphrase)
+                    Passphrase.display_debug_info(passphrase)
                 else:
                     raise PasswordRetriesExceeded
         else:
             if not key.load(target, passphrase):
-                if debug_enabled:
-                    Passphrase.display_debug_info(passphrase)
+                Passphrase.display_debug_info(passphrase)
                 raise PassphraseWrong
         key.init_ciphers(manifest_data)
         key._passphrase = passphrase

src/borg/helpers/passphrase.py

@@ -3,6 +3,7 @@
 import shlex
 import subprocess
 import sys
+import textwrap
 
 from . import bin_to_hex
 from . import Error
@@ -109,13 +110,15 @@ def verification(cls, passphrase):
             retry=True,
             env_var_override="BORG_DISPLAY_PASSPHRASE",
         ):
-            pw_msg = f"""
+            pw_msg = textwrap.dedent(
+                f"""
             Your passphrase (between double-quotes): "{passphrase}"
             Make sure the passphrase displayed above is exactly what you wanted.
             Your passphrase (UTF-8 encoding in hex): {bin_to_hex(passphrase.encode("utf-8"))}
             It is recommended to keep the UTF-8 encoding in hex together with the passphrase at a safe place.
             In case you should ever run into passphrase issues, it could sometimes help debugging them.
             """
+            )
             print(pw_msg, file=sys.stderr)
 
     @staticmethod