From 76ba16d4a6d5ec9309d1b9c3aad387dfce6a0c6e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 30 Jul 2014 11:23:36 -0500 Subject: [PATCH] implement nameing scheme from https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy --- src/pypungi/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index 95a8dee7..a1464659 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -1604,11 +1604,11 @@ class Pungi(pypungi.PungiBase): treesize = treesize * 2048 / 1024 / 1024 if treesize > 700: # we're larger than a 700meg CD - isoname = '%s-%s-%s-DVD.iso' % (self.config.get('pungi', 'iso_basename'), self.config.get('pungi', 'version'), - self.tree_arch) + isoname = '%s-DVD-%s-%s.iso' % (self.config.get('pungi', 'iso_basename'), self.tree_arch, + self.config.get('pungi', 'version')) else: - isoname = '%s-%s-%s.iso' % (self.config.get('pungi', 'iso_basename'), self.config.get('pungi', 'version'), - self.tree_arch) + isoname = '%s-%s-%s.iso' % (self.config.get('pungi', 'iso_basename'), self.tree_arch, + self.config.get('pungi', 'version')) isofile = os.path.join(self.isodir, isoname) @@ -1675,8 +1675,8 @@ class Pungi(pypungi.PungiBase): # Now link the boot iso if not self.tree_arch == 'source' and \ os.path.exists(os.path.join(self.topdir, 'images', 'boot.iso')): - isoname = '%s-%s-%s-netinst.iso' % (self.config.get('pungi', 'iso_basename'), - self.config.get('pungi', 'version'), self.tree_arch) + isoname = '%s-netinst-%s-%s.iso' % (self.config.get('pungi', 'iso_basename'), + self.tree_arch, self.config.get('pungi', 'version')) isofile = os.path.join(self.isodir, isoname) # link the boot iso to the iso dir