lumarel/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to NamedTemporaryFile instead of rolling our own

Browse Source
This commit is contained in:
Neil Hanlon 2022-11-19 20:14:31 -05:00
parent 98797d1b6c
commit 4e4a4bb123
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
iso/empanadas/empanadas/scripts/build_image.py
View File

@ -182,7 +182,6 @@ class ImageBuild:
provider = "vmware_desktop" provider = "vmware_desktop"
templates[f"{self.outname}.vmx"] = tmplenv.get_template('vagrant/vmx.tmpl') templates[f"{self.outname}.vmx"] = tmplenv.get_template('vagrant/vmx.tmpl')
if self.variant == "Libvirt": if self.variant == "Libvirt":
# Libvirt vagrant driver expects the qcow2 file to be called box.img. # Libvirt vagrant driver expects the qcow2 file to be called box.img.
qemu_command_index = [i for i, d in enumerate(self.stage_commands) if d[0] == "qemu-img"][0] qemu_command_index = [i for i, d in enumerate(self.stage_commands) if d[0] == "qemu-img"][0]
@ -273,11 +272,8 @@ class ImageBuild:
return output return output
def render_icicle_template(self) -> pathlib.Path: def render_icicle_template(self) -> pathlib.Path:
handle, output = tempfile.mkstemp() output = tempfile.NamedTemporaryFile(delete=False).name
if not handle: return self.render_template(output, self.template,
exit(3)
with os.fdopen(handle, "wb") as tmp:
_template = self.template.render(
architecture=self.architecture.name, architecture=self.architecture.name,
iso8601date=BUILDTIME.strftime("%Y%m%d"), iso8601date=BUILDTIME.strftime("%Y%m%d"),
installdir="kickstart" if self.cli_args.kickstartdir else "os", installdir="kickstart" if self.cli_args.kickstartdir else "os",
@ -289,13 +285,6 @@ class ImageBuild:
utcnow=BUILDTIME, utcnow=BUILDTIME,
version_variant=self.architecture.version if not self.variant else f"{self.architecture.version}-{self.variant}", version_variant=self.architecture.version if not self.variant else f"{self.architecture.version}-{self.variant}",
) )
tmp.write(_template.encode())
tmp.flush()
output = pathlib.Path(output)
if not output.exists():
log.error("Failed to write TDL template")
raise Exception("Failed to write TDL template")
return output
def build_command(self) -> List[str]: def build_command(self) -> List[str]:
build_command = ["imagefactory", *self.command_args, "base_image", *self.common_args, *self.kickstart_arg, self.tdl_path build_command = ["imagefactory", *self.command_args, "base_image", *self.common_args, *self.kickstart_arg, self.tdl_path