Manual Correction of merges of src/product.py

  Merge from cb2ab15f90e8f4f454f07a061c63924a91373778 and 89f815db3c210ded81158622700dfed3ccad658f
   -  suppression of obsolete function product_is_sample
   -  ajout bloc else  (fix archive not found)

diff --git a/src/product.py b/src/product.py
index 6a9a8d4b1d187220418322736b87c09afbe948a8..42c59a3f3dad5f10e1fbae1243e7907f9789dd01 100644 (file)
--- a/src/product.py
+++ b/src/product.py
@@ -198,7 +198,9 @@ Please add a section in it.""") % {"1" : vv, "2" : prod_pyconf_path}
                     DBG.tofix(msg, config.PATHS.ARCHIVEPATH) #avoid 2 messages in compile
                     prod_info.archive_info.archive_name = arch_name #without path
                     # raise src.SatException(msg) #may be a warning, continue #8646
-                prod_info.archive_info.archive_name = arch_path
+                else:
+                    prod_info.archive_info.archive_name = arch_path
+
         
     # If the product compiles with a script, check the script existence
     # and if it is executable
@@ -572,20 +574,6 @@ def check_source(product_info):
                 return False
     return True
 
-def product_is_sample(product_info):
-    """Know if a product has the sample type
-    
-    :param product_info Config: The configuration specific to 
-                               the product
-    :return: True if the product has the sample type, else False
-    :rtype: boolean
-    """
-    if 'type' in product_info:
-        ptype = product_info.type
-        return ptype.lower() == 'sample'
-    else:
-        return False
-
 def product_is_salome(product_info):
     """Know if a product is a SALOME module