From 3de6d094be91c91810ead3f6846857833e021236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 11 Aug 2016 10:21:35 +0200 Subject: [PATCH] Fix config validation script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It got broken in commit 8323a735 which added a requirement for a compose to have valid paths. This patch adds that with somewhat dummy values. Signed-off-by: Lubomír Sedlář --- bin/pungi-config-validate | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/bin/pungi-config-validate b/bin/pungi-config-validate index 3d61f113..3f390cc9 100755 --- a/bin/pungi-config-validate +++ b/bin/pungi-config-validate @@ -18,20 +18,39 @@ if here != '/usr/bin': import pungi.compose import pungi.phases +import pungi.paths class ValidationCompose(pungi.compose.Compose): - def __init__(self, conf, has_old): + def __init__(self, conf, has_old, topdir): + self.topdir = topdir self.conf = conf self._logger = None self.just_phases = [] self.skip_phases = [] self.has_old_composes = has_old + self.paths = pungi.paths.Paths(self) @property def old_composes(self): return '/dummy' if self.has_old_composes else None + @property + def compose_id(self): + return 'Dummy-1.0-20160811.t.0' + + @property + def compose_type(self): + return 'test' + + @property + def compose_date(self): + return '20160811' + + @property + def compose_respin(self): + return '0' + @contextlib.contextmanager def in_temp_dir(): @@ -44,7 +63,7 @@ def run(config, topdir, has_old): conf = kobo.conf.PyConfigParser() conf.load_from_file(config) - compose = ValidationCompose(conf, has_old) + compose = ValidationCompose(conf, has_old, topdir) pkgset_phase = pungi.phases.PkgsetPhase(compose) phases = [