curtin-dev team mailing list archive

[Dan Bungert <mp+436268@xxxxxxxxxxxxxxxxxx>]

Dan Bungert has proposed merging ~dbungert/curtin:drop-fstring into curtin:master.

Commit message:
apt: use string.format instead of f-string

In pursuit of older python version support, drop the f-string usage.

Co-Authored-By: Olivier Gayot <olivier.gayot@xxxxxxxxxxxxx>

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/436268
-- 
Your team curtin developers is requested to review the proposed merge of ~dbungert/curtin:drop-fstring into curtin:master.

diff --git a/curtin/commands/apt_config.py b/curtin/commands/apt_config.py
index 0d559e2..f9cce34 100644
--- a/curtin/commands/apt_config.py
+++ b/curtin/commands/apt_config.py
@@ -404,7 +404,7 @@ def add_apt_key_raw(keyname, key, target=None):
         keyfile_ext = 'gpg'
         omode = 'wb'
 
-    keyfile = f'/etc/apt/trusted.gpg.d/{keyname}.{keyfile_ext}'
+    keyfile = '/etc/apt/trusted.gpg.d/{}.{}'.format(keyname, keyfile_ext)
     target_keyfile = paths.target_path(target, keyfile)
     util.write_file(target_keyfile, key, mode=0o644, omode=omode)
     LOG.debug("Adding key to '%s':\n'%s'", target_keyfile, key)