From ed68c1c8c14195b25eef34d84ceedb24e189f884 Mon Sep 17 00:00:00 2001
From: Dan Bungert <daniel.bungert@canonical.com>
Date: Tue, 3 Oct 2023 16:36:45 -0600
Subject: [PATCH] util: standardize on term 'mode'

(cherry picked from commit ddc3345eb69afee38e0b70c943b7cce86a2d0723)
---
 subiquity/models/subiquity.py | 6 +++---
 subiquitycore/file_util.py    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index 6c3991d1..cbd0cc64 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -434,7 +434,7 @@ class SubiquityModel:
             ("etc/cloud/ds-identify.cfg", "policy: enabled\n", 0o644),
         ]
         # Add cloud-init clean hooks to support golden-image creation.
-        cfg_files = ["/" + path for (path, _content, _cmode) in files]
+        cfg_files = ["/" + path for (path, _content, _mode) in files]
         cfg_files.extend(self.network.rendered_config_paths())
         if lsb_release()["release"] not in ("20.04", "22.04"):
             cfg_files.append("/etc/cloud/cloud-init.disabled")
@@ -467,10 +467,10 @@ class SubiquityModel:
         if self.source.current.variant == "core":
             # can probably be supported but requires changes
             return
-        for path, content, cmode in self._cloud_init_files():
+        for path, content, mode in self._cloud_init_files():
             path = os.path.join(self.target, path)
             os.makedirs(os.path.dirname(path), exist_ok=True)
-            write_file(path, content, cmode=cmode)
+            write_file(path, content, mode=mode)
 
     def _media_info(self):
         if os.path.exists("/cdrom/.disk/info"):
diff --git a/subiquitycore/file_util.py b/subiquitycore/file_util.py
index 50d57349..0d2ac125 100644
--- a/subiquitycore/file_util.py
+++ b/subiquitycore/file_util.py
@@ -48,9 +48,9 @@ def set_log_perms(target, *, isdir=True, group_write=False, mode=None):
 
 
 @contextlib.contextmanager
-def open_perms(filename, *, cmode=None):
-    if cmode is None:
-        cmode = _DEF_PERMS_FILE
+def open_perms(filename, *, mode=None):
+    if mode is None:
+        mode = _DEF_PERMS_FILE
 
     tf = None
     try:
@@ -59,7 +59,7 @@ def open_perms(filename, *, cmode=None):
         tf = tempfile.NamedTemporaryFile(dir=dirname, delete=False, mode="w")
         yield tf
         tf.close()
-        set_log_perms(tf.name, mode=cmode)
+        set_log_perms(tf.name, mode=mode)
         os.rename(tf.name, filename)
     except OSError as e:
         if tf is not None: