]> SALOME platform Git repositories - tools/sat.git/commitdiff
Salome HOME
spns #40779: support multi repositories
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Sat, 4 May 2024 14:53:42 +0000 (16:53 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Sat, 4 May 2024 14:53:42 +0000 (16:53 +0200)
commands/source.py

index b8b8da51b556db7d22d1c0f4d5a2eb25c948ae14..a99a5b33969c12b4f8228c8e4a7faad85b09bd33 100644 (file)
@@ -93,18 +93,18 @@ def get_source_from_git(config,
     repo_git = None
     git_server = src.get_git_server(config,logger)
     product_file = product_info.from_file.split('/').pop()
-    if 'git_info' in  product_info and 'repo_name' in product_info.git_info:
-        if git_server in product_info.git_info.repo_name.keys():
-            repo_git = product_info.git_info.repo_name[git_server]
+    if 'git_info' in  product_info and 'repositories' in product_info.git_info:
+        if git_server in product_info.git_info.repositories.keys():
+            repo_git = product_info.git_info.repositories[git_server]
         elif 'properties' in product_info and 'is_opensource' in product_info.properties and product_info.properties.is_opensource == 'yes' :
-            for git_server in product_info.git_info.repo_name.keys():
+            for git_server in product_info.git_info.repositories.keys():
                 if git_server in config.VARS.opensource_repositories_servers:
-                    repo_git =  product_info.git_info.repo_name[git_server]
+                    repo_git =  product_info.git_info.repositories[git_server]
                     break
         elif 'properties' in product_info and not 'is_opensource' in product_info.properties:
-            for git_server in product_info.git_info.repo_name.keys():
+            for git_server in product_info.git_info.repositories.keys():
                 if git_server in config.VARS.opensource_repositories_servers:
-                    repo_git =  product_info.git_info.repo_name[git_server]
+                    repo_git =  product_info.git_info.repositories[git_server]
                     logger.warning("Using opensource repository ({}) for product {}".format(git_server, product_info.name))
                     break
         else: