PR#250: [checksum] Add arch to file name - pungi

pungi

#250 [checksum] Add arch to file name

Merged 9 years ago by ausil. Opened 9 years ago by lsedlar.

lsedlar/pungi arch-in-checksum into master

[checksum] Add arch to file name

Lubomír Sedlář • 9 years ago

1ebb9d1

doc/configuration.rst

file modified

+13 -3

		`@@ -1051,9 +1051,19 @@`
		`prefix to that name`

		`It is possible to use format strings that will be replace by actual values.`
		- The allowed keys are ``%(release_showrt)s``, ``%(release_short)s``,
		- ``%(release_id)s``, ``%(variant)s``, ``%(version)s``, ``%(date)s``,
		- ``%(type_suffix)s``, ``%(label)s`` and ``%(respin)s``
		`+ The allowed keys are:`
		`+`
		+ * ``arch``
		+ * ``compose_id``
		+ * ``date``
		+ * ``label``
		+ * ``label_major_version``
		+ * ``release_short``
		+ * ``respin``
		+ * ``type``
		+ * ``type_suffix``
		+ * ``version``
		+ * ``version``

		`For example, for Fedora the prefix should be`
		``%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s``.

pungi/compose.py

file modified

+7 -25

		`@@ -33,7 +33,7 @@`
		`from pungi.wrappers.variants import VariantsXmlParser`
		`from pungi.paths import Paths`
		`from pungi.wrappers.scm import get_file_from_scm`
		`- from pungi.util import makedirs, get_arch_variant_data`
		`+ from pungi.util import makedirs, get_arch_variant_data, get_format_substs`
		`from pungi.metadata import compose_to_composeinfo`


		`@@ -270,25 +270,6 @@`
		`return`
		`return open(self.status_file, "r").read().strip()`

		`- def get_format_substs(self, **kwargs):`
		`- """Return a dict of basic format substitutions.`
		`-`
		`- Any kwargs will be added as well.`
		`- """`
		`- substs = {`
		`- 'compose_id': self.compose_id,`
		`- 'release_short': self.ci_base.release.short,`
		`- 'version': self.ci_base.release.version,`
		`- 'date': self.compose_date,`
		`- 'respin': self.compose_respin,`
		`- 'type': self.compose_type,`
		`- 'type_suffix': self.compose_type_suffix,`
		`- 'label': self.compose_label,`
		`- 'label_major_version': self.compose_label_major_version,`
		`- }`
		`- substs.update(kwargs)`
		`- return substs`
		`-`
		`def get_image_name(self, arch, variant, disc_type='dvd',`
		`disc_num=1, suffix='.iso', format=None):`
		`"""Create a filename for image with given parameters.`
		`@@ -310,11 +291,12 @@`
		`variant_uid = variant.parent.uid`
		`else:`
		`variant_uid = variant.uid`
		`- args = self.get_format_substs(variant=variant_uid,`
		`- arch=arch,`
		`- disc_type=disc_type,`
		`- disc_num=disc_num,`
		`- suffix=suffix)`
		`+ args = get_format_substs(self,`
		`+ variant=variant_uid,`
		`+ arch=arch,`
		`+ disc_type=disc_type,`
		`+ disc_num=disc_num,`
		`+ suffix=suffix)`
		`try:`
		`return format % args`
		`except KeyError as err:`

pungi/phases/image_checksum.py

file modified

+7 -14

		`@@ -4,6 +4,7 @@`
		`from kobo import shortcuts`

		`from .base import PhaseBase`
		`+ from ..util import get_format_substs`


		`MULTIPLE_CHECKSUMS_ERROR = (`
		`@@ -66,29 +67,21 @@`
		`for arch in self.compose.im.images[variant]:`
		`for image in self.compose.im.images[variant][arch]:`
		`path = os.path.dirname(os.path.join(top_dir, image.path))`
		`- images.setdefault((variant, path), set()).add(image)`
		`+ images.setdefault((variant, arch, path), set()).add(image)`
		`return images`

		`- def _get_base_filename(self, variant):`
		`+ def _get_base_filename(self, variant, arch):`
		`base_checksum_name = self.compose.conf.get('media_checksum_base_filename', '')`
		`if base_checksum_name:`
		`- base_checksum_name = base_checksum_name % {`
		`- 'release_short': self.compose.ci_base.release.short,`
		`- 'release_id': self.compose.ci_base.release_id,`
		`- 'variant': variant,`
		`- 'version': self.compose.ci_base.release.version,`
		`- 'date': self.compose.compose_date,`
		`- 'type_suffix': self.compose.compose_type_suffix,`
		`- 'respin': self.compose.compose_respin,`
		`- 'label': self.compose.compose_label,`
		`- }`
		`+ substs = get_format_substs(self.compose, variant=variant, arch=arch)`
		`+ base_checksum_name = base_checksum_name % substs`
		`base_checksum_name += '-'`
		`return base_checksum_name`

		`def run(self):`
		`- for (variant, path), images in self._get_images().iteritems():`
		`+ for (variant, arch, path), images in self._get_images().iteritems():`
		`checksums = {}`
		`- base_checksum_name = self._get_base_filename(variant)`
		`+ base_checksum_name = self._get_base_filename(variant, arch)`
		`for image in images:`
		`filename = os.path.basename(image.path)`
		`full_path = os.path.join(path, filename)`

pungi/util.py

file modified

+28 -7

		`@@ -370,13 +370,14 @@`
		`if not variant_uid and "%(variant)s" in i:`
		`continue`
		`try:`
		`- volid = i % compose.get_format_substs(variant=variant_uid,`
		`- release_short=release_short,`
		`- version=release_version,`
		`- arch=arch,`
		`- disc_type=disc_type or '',`
		`- base_product_short=base_product_short,`
		`- base_product_version=base_product_version)`
		`+ volid = i % get_format_substs(compose,`
		`+ variant=variant_uid,`
		`+ release_short=release_short,`
		`+ version=release_version,`
		`+ arch=arch,`
		`+ disc_type=disc_type or '',`
		`+ base_product_short=base_product_short,`
		`+ base_product_version=base_product_version)`
		`except KeyError as err:`
		`raise RuntimeError('Failed to create volume id: unknown format element: %s' % err.message)`
		`volid = _apply_substitutions(compose, volid)`
		`@@ -472,3 +473,23 @@`
		`compose.log_info(str(exc))`
		`tb = traceback.format_exc()`
		`compose.log_debug(tb)`
		`+`
		`+`
		`+ def get_format_substs(compose, **kwargs):`
		`+ """Return a dict of basic format substitutions.`
		`+`
		`+ Any kwargs will be added as well.`
		`+ """`
		`+ substs = {`
		`+ 'compose_id': compose.compose_id,`
		`+ 'release_short': compose.ci_base.release.short,`
		`+ 'version': compose.ci_base.release.version,`
		`+ 'date': compose.compose_date,`
		`+ 'respin': compose.compose_respin,`
		`+ 'type': compose.compose_type,`
		`+ 'type_suffix': compose.compose_type_suffix,`
		`+ 'label': compose.compose_label,`
		`+ 'label_major_version': compose.compose_label_major_version,`
		`+ }`
		`+ substs.update(kwargs)`
		`+ return substs`

tests/helpers.py

file modified

		`@@ -23,9 +23,11 @@`
		`self.supported = True`
		`self.compose_date = '20151203'`
		`self.compose_type_suffix = '.t'`
		`+ self.compose_type = 'test'`
		`self.compose_respin = 0`
		`self.compose_id = 'Test-20151203.0.t'`
		`self.compose_label = None`
		`+ self.compose_label_major_version = None`
		`self.image_release = '20151203.t.0'`
		`self.ci_base = mock.Mock(`
		`release_id='Test-1.0',`