common: handle default element without revision

Checks fail when default revision is set in remote instead of default element.

Signed-off-by: David Rozé <[email protected]>

Author: david-baylibre

repo_resource/common.py

@@ -219,6 +219,7 @@ def __init__(self, url, revision='HEAD', name='default.xml',
         self.__depth = depth
         self.__version: Version = None
         self.__remote_url = {}
+        self.__remote_revision = {}
         workdir.mkdir(parents=True, exist_ok=True)
 
         # gitrepo from https://github.com/grouperenault/gitrepo
@@ -243,10 +244,15 @@ def __restore_oldpwd(self):
     def __add_remote_url(self, remote, url):
         self.__remote_url[remote] = url
 
+    def __add_remote_revision(self, remote, rev):
+        self.__remote_revision[remote] = rev
 
     def __get_remote_url(self, remote):
         return self.__remote_url[remote]
 
+    def __get_remote_revision(self, remote):
+        return self.__remote_revision[remote]
+
     def init(self):
         self.__change_to_workdir()
         try:
@@ -358,17 +364,20 @@ def update_manifest(self, jobs):
                 xml = ET.parse('.repo/manifests/'+self.__name)
                 manifest = xml.getroot()
 
-                # Get default values from manifest
-                defaults = manifest.find('default')
-                if defaults is not None:
-                    defaultRemote = defaults.get('remote')
-                    defaultBranch = defaults.get('revision')
-
                 for r in manifest.findall('remote'):
                     url = r.get('fetch').rstrip('/')
                     if not re.match("[a-zA-Z]+://", url):
                         url = re.sub('/[a-z-.]*$', '/', self.__url) + url
                     self.__add_remote_url(r.get('name'), url)
+                    if (rev := r.get('revision')) is not None:
+                        self.__add_remote_revision(r.get('name'), rev)
+
+                # Get default values from manifest
+                defaults = manifest.find('default')
+                if defaults is not None:
+                    defaultRemote = defaults.get('remote')
+                    defaultBranch = defaults.get('revision') \
+                        or self.__get_remote_revision(defaultRemote)
 
                 for p in manifest.findall('project'):
                     project = p.get('name')