From 9d47ec63fcedae6ae25bb60cf73c8ace7da085b2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Brucker Date: Mon, 19 Aug 2024 10:14:56 +0100 Subject: [PATCH] config: Don't synchronize user-provided sourcedir To reuse an existing repository, the recipes.rst documentation suggests overriding the 'sourcedir' variable. However, this will attempt to synchronize the user source tree from the existing 'repo' configuration, overriding any changes the user made. Clear the 'repo' configuration when the user provides their own source tree. Signed-off-by: Jean-Philippe Brucker --- shrinkwrap/utils/config.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shrinkwrap/utils/config.py b/shrinkwrap/utils/config.py index 52246ef..9105472 100644 --- a/shrinkwrap/utils/config.py +++ b/shrinkwrap/utils/config.py @@ -570,6 +570,11 @@ def resolveb(config, btvars={}, clivars={}): desc['sourcedir'] = os.path.join(workspace.build, 'source', comp_dir) + else: + # Don't attempt to synchronize the source tree, it would override + # the user content + desc['repo'] = {} + if desc['builddir'] is None: desc['builddir'] = os.path.join(workspace.build, 'build', -- GitLab