diff options
| author | Daniel Smith <daniel.smith@qt.io> | 2024-02-12 11:22:22 +0100 |
|---|---|---|
| committer | Daniel Smith <daniel.smith@qt.io> | 2024-03-20 12:42:11 +0000 |
| commit | 4296b4da75575fb4409b72e5c35c5727e44594ce (patch) | |
| tree | e377c4e0d2d21afc0c90297680bba37c6efa79fc | |
| parent | d36b21509650c193349d8e6a0269c433cfa8dfa2 (diff) | |
Set the target branch on missing yocto dependencies
The yocto supermodule update may contain some repos that are not part
of the common update round. If this is the case, then we need to make
sure the target branch is set on the repo following the discovery
process. Otherwise, the default dev or master branch will be chosen.
Change-Id: Id5d5acbab16cccf5fcbba7a8f5d925979da34a8d
Reviewed-by: Daniel Smith <daniel.smith@qt.io>
| -rw-r--r-- | util/dependency_updater/tools/toolbox.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/dependency_updater/tools/toolbox.py b/util/dependency_updater/tools/toolbox.py index aec3ae8..11a90f9 100644 --- a/util/dependency_updater/tools/toolbox.py +++ b/util/dependency_updater/tools/toolbox.py @@ -1066,6 +1066,8 @@ def push_yocto_update(config: Config, retry: bool = False) -> Repo: else: # Expected to be just a regular module module_name = repo_name_maybe_submodule module_repo = search_for_repo(config, module_name) + if not module_repo.branch: + module_repo.branch = config.args.branch if not module_repo.original_ref: module_repo.original_ref, module_repo.original_message = get_head(config, module_repo) if pinned_submodule_sha: |