diff --git a/scripts/StepRunner/StepsRunner.py b/scripts/StepRunner/StepsRunner.py index ceadc70..e56f802 100644 --- a/scripts/StepRunner/StepsRunner.py +++ b/scripts/StepRunner/StepsRunner.py @@ -16,8 +16,8 @@ class StepsRunner: continue if stripped.startswith("#"): continue - - self.processLine(stripped) + else: + self.processLine(stripped) def processLine(self, line): if self.shCommandBuilder.isShCommand(line): diff --git a/scripts/utils/configs/BuildConfigProvider.py b/scripts/utils/configs/BuildConfigProvider.py index 02c3f07..bdc1af7 100644 --- a/scripts/utils/configs/BuildConfigProvider.py +++ b/scripts/utils/configs/BuildConfigProvider.py @@ -6,7 +6,8 @@ class BuildConfigProvider: configs = [] for l in leafs: config = self.fetchConfigFromLeafWrapper(l) - configs.append(config) + if config.get('build_ready', 'false') == 'true': + configs.append(config) return configs @@ -32,7 +33,11 @@ class BuildConfigProvider: unionConf = {} for a in ancestors: - unionConf.update(a['dict']) + dictionary = a['dict'] + for k in dictionary: + value = dictionary[k] + if type(value) is str: + unionConf[k] = value return unionConf