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

fix naming for live images

Browse Source
This commit is contained in:
Louis Abel 2022-07-29 21:58:10 -07:00
parent 6c20ee5a43
commit a950af3404
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
iso/empanadas/empanadas/util/iso_utils.py
View File

@ -1683,16 +1683,17 @@ class LiveBuild:
) )
required_pkgs = self.livemap['required_pkgs'] required_pkgs = self.livemap['required_pkgs']
volid = '{}-{}-{}'.format( volid = '{}-{}-{}-{}'.format(
self.shortname, self.shortname,
image, self.major_version,
self.release self.minor_version,
image
) )
isoname = '{}-{}-{}-{}-{}.iso'.format( isoname = '{}-{}-{}-{}-{}.iso'.format(
self.shortname, self.shortname,
image,
self.release, self.release,
image,
self.current_arch, self.current_arch,
self.date self.date
) )
@ -1905,8 +1906,8 @@ class LiveBuild:
live_dir_arch = os.path.join(self.live_work_dir, arch) live_dir_arch = os.path.join(self.live_work_dir, arch)
isoname = '{}-{}-{}-{}-{}.iso'.format( isoname = '{}-{}-{}-{}-{}.iso'.format(
self.shortname, self.shortname,
image,
self.release, self.release,
image,
arch, arch,
self.date self.date
) )