From: crouzet <nicolas.crouzet@cea.fr>
Date: Wed, 10 Apr 2019 13:01:35 +0000 (+0200)
Subject: use a repo_dev property to trigger the use of the dev repo, in addition to dev mode
X-Git-Tag: 5.4.0~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69d6a69f43f200590c610e2e0bca02983e154bf3;p=tools%2Fsat.git

use a repo_dev property to trigger the use of the dev repo, in addition to dev mode
---

diff --git a/commands/source.py b/commands/source.py
index e9295cc..823e1da 100644
--- a/commands/source.py
+++ b/commands/source.py
@@ -61,7 +61,8 @@ def get_source_for_dev(config, product_info, source_dir, logger, pad):
     
     return retcode
 
-def get_source_from_git(product_info,
+def get_source_from_git(config,
+                        product_info,
                         source_dir,
                         logger,
                         pad,
@@ -84,14 +85,24 @@ def get_source_from_git(product_info,
     # The str to display
     coflag = 'git'
 
-    # Get the repository address. (from repo_dev key if the product is 
-    # in dev mode.
-    if is_dev and 'repo_dev' in product_info.git_info:
+    use_repo_dev=False
+    if ("APPLICATION" in config  and
+            "properties"  in config.APPLICATION  and
+            "repo_dev"    in config.APPLICATION.properties  and
+            config.APPLICATION.properties.repo_dev == "yes") :
+                use_repo_dev=True
+
+    # Get the repository address.
+    # If the application has the repo_dev property
+    # Or if the product is in dev mode
+    # Then we use repo_dev if the key exists
+    if (is_dev or use_repo_dev) and 'repo_dev' in product_info.git_info:
         coflag = src.printcolors.printcHighlight(coflag.upper())
         repo_git = product_info.git_info.repo_dev    
     else:
         repo_git = product_info.git_info.repo    
         
+
     # Display informations
     logger.write('%s:%s' % (coflag, src.printcolors.printcInfo(repo_git)), 3, 
                  False)
@@ -352,7 +363,7 @@ def get_product_sources(config,
                                    pad)
 
     if product_info.get_source == "git":
-        return get_source_from_git(product_info, source_dir, logger, pad, 
+        return get_source_from_git(config, product_info, source_dir, logger, pad, 
                                     is_dev,env_appli)
 
     if product_info.get_source == "archive":