From 75748bbf4eb0d24d68647c9a989333c1145c894f Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 31 Jul 2025 15:45:57 +0200 Subject: [PATCH] Fixed issue with updating modules with empty string subdirectory Signed-off-by: Ole Herman Schumacher Elgesem --- cfbs/updates.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cfbs/updates.py b/cfbs/updates.py index 64d66ad5..608eaa24 100644 --- a/cfbs/updates.py +++ b/cfbs/updates.py @@ -128,7 +128,13 @@ def update_module(old_module, new_module, module_updates, update): commit_differs = old_module["commit"] != new_module["commit"] old_version = old_module.get("version") local_changes_made = False - for key in old_module.keys(): + for key in list(old_module.keys()): + if key == "subdirectory" and old_module[key] == "" and key not in new_module: + # Handle special case of old modules having "" subdirectory: + # no longer allowed, but can be safely removed + del old_module[key] + local_changes_made = True + continue if key not in new_module or old_module[key] == new_module[key]: continue if key == "steps":