common: check remote revision when getting project branch

The project branch is set according to: 1. 'revision' entry in the xml or 2. the remote revision of the project or 3. default branch (retrieved by 'default' xml entry) We added the condition 2. because if a project contains a remote different than the default, we must get the revision according to this remote and not the default. Signed-off-by: Julien Masson <[email protected]>
makohoek · Sep 17, 2024 · 7ac7496 · 7ac7496
1 parent 98b8277
commit 7ac7496
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/repo_resource/common.py b/repo_resource/common.py
@@ -460,8 +460,10 @@ def update_manifest(self, jobs):
 
                 for p in manifest.findall('project'):
                     project = p.get('name')
-                    projectBranch = p.get('revision') or defaultBranch
                     projectRemote = p.get('remote') or defaultRemote
+                    projectBranch = p.get('revision') \
+                        or self.__get_remote_revision(projectRemote) \
+                        or defaultBranch
                     projectRemoteUrl = self.__get_remote_url(projectRemote)
                     projects.append((projectRemote, projectRemoteUrl,
                                      project, projectBranch))
@@ -472,8 +474,10 @@ def update_manifest(self, jobs):
                 # Update revisions
                 for p in manifest.findall('project'):
                     project = p.get('name')
-                    projectBranch = p.get('revision') or defaultBranch
                     projectRemote = p.get('remote') or defaultRemote
+                    projectBranch = p.get('revision') \
+                        or self.__get_remote_revision(projectRemote) \
+                        or defaultBranch
                     # find revision of the project in revisionList
                     for url, branch, rev in revisionList:
                         if (