StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: standardize on term 'mode' 

(cherry picked from commit ddc3345eb6)
This commit is contained in:
Dan Bungert 2023-10-03 16:36:45 -06:00
parent 8827624a7f
commit ed68c1c8c1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subiquity/models/subiquity.py
View File

@ -434,7 +434,7 @@ class SubiquityModel:
("etc/cloud/ds-identify.cfg", "policy: enabled\n", 0o644), ("etc/cloud/ds-identify.cfg", "policy: enabled\n", 0o644),
] ]
# Add cloud-init clean hooks to support golden-image creation. # 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()) cfg_files.extend(self.network.rendered_config_paths())
if lsb_release()["release"] not in ("20.04", "22.04"): if lsb_release()["release"] not in ("20.04", "22.04"):
cfg_files.append("/etc/cloud/cloud-init.disabled") cfg_files.append("/etc/cloud/cloud-init.disabled")
@ -467,10 +467,10 @@ class SubiquityModel:
if self.source.current.variant == "core": if self.source.current.variant == "core":
# can probably be supported but requires changes # can probably be supported but requires changes
return 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) path = os.path.join(self.target, path)
os.makedirs(os.path.dirname(path), exist_ok=True) 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): def _media_info(self):
if os.path.exists("/cdrom/.disk/info"): if os.path.exists("/cdrom/.disk/info"):

8
subiquitycore/file_util.py
View File

@ -48,9 +48,9 @@ def set_log_perms(target, *, isdir=True, group_write=False, mode=None):
@contextlib.contextmanager @contextlib.contextmanager
def open_perms(filename, *, cmode=None): def open_perms(filename, *, mode=None):
if cmode is None: if mode is None:
cmode = _DEF_PERMS_FILE mode = _DEF_PERMS_FILE
tf = None tf = None
try: try:
@ -59,7 +59,7 @@ def open_perms(filename, *, cmode=None):
tf = tempfile.NamedTemporaryFile(dir=dirname, delete=False, mode="w") tf = tempfile.NamedTemporaryFile(dir=dirname, delete=False, mode="w")
yield tf yield tf
tf.close() tf.close()
set_log_perms(tf.name, mode=cmode) set_log_perms(tf.name, mode=mode)
os.rename(tf.name, filename) os.rename(tf.name, filename)
except OSError as e: except OSError as e:
if tf is not None: if tf is not None: