From 45401e6a327b252127f5525d9bac9d51b5672da1 Mon Sep 17 00:00:00 2001 From: jakub-nt <175944085+jakub-nt@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:18:06 +0200 Subject: [PATCH] Improved the warning text when an added local module contains a policy file with an autorun tag Ticket: ENT-10229 Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com> --- cfbs/cfbs_config.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cfbs/cfbs_config.py b/cfbs/cfbs_config.py index 88e7187..a62af38 100644 --- a/cfbs/cfbs_config.py +++ b/cfbs/cfbs_config.py @@ -286,13 +286,18 @@ def _handle_local_module(self, module): pattern = "%s/**/*.cf" % name policy_files = glob.glob(pattern, recursive=True) + modules_available = [m.get("name", "") for m in self.get("build", [])] + is_autorun_enabled = any( + m in modules_available for m in ["autorun", "./def.json"] + ) # only a heuristic + for file in policy_files: if _has_autorun_tag(file): - log.warning( - "Found bundle tagged with autorun in local policy file '%s': " - % file - + "Note that the autorun tag is ignored when adding local policy files or subdirectories." - ) + if not is_autorun_enabled: + log.warning( + "Found autorun tag in '%s', " % file + + "but it looks like the autorun feature is not enabled, consider enabling it via 'cfbs add autorun' or a custom './def.json' file." + ) # TODO: Support adding local modules with autorun tag self._add_policy_files_build_step(module)