From: Christian Van Wambeke Date: Wed, 27 Jun 2018 10:43:21 +0000 (+0200) Subject: fix on src/options.py commands/prepare.py X-Git-Tag: 5.1.0~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2afd95e08663f084e88f2703f5dcb54956a684f1;p=tools%2Fsat.git fix on src/options.py commands/prepare.py --- diff --git a/commands/prepare.py b/commands/prepare.py index 687d051..eb05265 100644 --- a/commands/prepare.py +++ b/commands/prepare.py @@ -18,6 +18,7 @@ import re import os +import pprint as PP import src import src.debug as DBG @@ -77,34 +78,6 @@ def get_products_list(options, cfg, logger): return products_infos -def remove_products(arguments, l_products_info, logger): - '''function that removes the products in l_products_info from arguments list. - - :param arguments str: The arguments from which to remove products - :param l_products_info list: List of - (str, Config) => (product_name, product_info) - :param logger Logger: The logger instance to use for the display and logging - :return: The updated arguments. - :rtype: str - ''' - args = str(arguments) #copy of "--products ,XDATA,TESSCODE,cmake" for example - largs = args.split(',') - DBG.write("largs", largs) - toRemove = [name for name, xx in l_products_info] - DBG.write("remove_products", toRemove) - removed = [] - notRemoved = [] - for name in largs[1:]: # skip largs[0] as "--products " - if name in toRemove: - removed.append(name) - else: - notRemoved.append(name) - # DBG.write(removed, removed, True) - logger.write(" %s\n" % ",".join(removed), 1) - DBG.write("notRemoved", notRemoved) - res = largs[0] + ",".join(notRemoved) - return res - def find_products_already_getted(l_products): '''function that returns the list of products that have an existing source directory. @@ -169,58 +142,55 @@ def run(args, runner, logger): products_infos = get_products_list(options, runner.cfg, logger) # Construct the arguments to pass to the clean, source and patch commands - args_appli = runner.cfg.VARS.application + ' ' - args_product_opt = '--products ' + args_appli = runner.cfg.VARS.application + " " # useful whitespace if options.products: - for p_name in options.products: - args_product_opt += ',' + p_name - else: - for p_name, __ in products_infos: - args_product_opt += ',' + p_name + listProd = list(options.products) + else: # no product interpeted as all products + listProd = [name for name, tmp in products_infos] + + DBG.write("prepare products", sorted(listProd)) + args_product_opt = '--products ' + ",".join(listProd) + do_source = (len(listProd) > 0) + ldev_products = [p for p in products_infos if src.product.product_is_dev(p[1])] - args_product_opt_clean = args_product_opt + newList = listProd # default if not options.force and len(ldev_products) > 0: l_products_not_getted = find_products_already_getted(ldev_products) - if len(l_products_not_getted) > 0: + listNot = [i for i, tmp in l_products_not_getted] + newList, removedList = removeInList(listProd, listNot) + if len(removedList) > 0: msg = _("""\ -Do not get the source of the following products in development mode +Do not get the source of the following products in development mode. Use the --force option to overwrite it. """) + msg += "\n%s\n" % ",".join(removedList) logger.write(src.printcolors.printcWarning(msg), 1) - args_product_opt_clean = remove_products(args_product_opt_clean, - l_products_not_getted, - logger) - logger.write("\n", 1) + args_product_opt_clean = '--products ' + ",".join(newList) + do_clean = (len(newList) > 0) - args_product_opt_patch = args_product_opt + newList = listProd # default if not options.force_patch and len(ldev_products) > 0: l_products_with_patchs = find_products_with_patchs(ldev_products) - if len(l_products_with_patchs) > 0: + listNot = [i for i, tmp in l_products_with_patchs] + newList, removedList = removeInList(listProd, listNot) + if len(removedList) > 0: msg = _("""\ -do not patch the following products in development mode +Do not patch the following products in development mode. Use the --force_patch option to overwrite it. """) + msg += "\n%s\n" % ",".join(removedList) logger.write(src.printcolors.printcWarning(msg), 1) - args_product_opt_patch = remove_products(args_product_opt_patch, - l_products_with_patchs, - logger) - logger.write("\n", 1) - + + args_product_opt_patch = '--products ' + ",".join(newList) + do_patch = (len(newList) > 0) + # Construct the final commands arguments args_clean = args_appli + args_product_opt_clean + " --sources" args_source = args_appli + args_product_opt args_patch = args_appli + args_product_opt_patch - - # If there is no more any product in the command arguments, - # do not call the concerned command - oExpr = re.compile("^--products *$") - do_clean = not(oExpr.search(args_product_opt_clean)) - do_source = not(oExpr.search(args_product_opt)) - do_patch = not(oExpr.search(args_product_opt_patch)) - - + # Initialize the results to a failing status res_clean = 1 res_source = 1 @@ -231,8 +201,7 @@ Use the --force_patch option to overwrite it. msg = _("Clean the source directories ...") logger.write(msg, 3) logger.flush() - res_clean = runner.clean(args_clean, batch=True, verbose = 0, - logger_add_link = logger) + res_clean = runner.clean(args_clean, batch=True, verbose = 0, logger_add_link = logger) if res_clean == 0: logger.write('%s\n' % src.printcolors.printc(src.OK_STATUS), 3) else: @@ -240,8 +209,7 @@ Use the --force_patch option to overwrite it. if do_source: msg = _("Get the sources of the products ...") logger.write(msg, 5) - res_source = runner.source(args_source, - logger_add_link = logger) + res_source = runner.source(args_source, logger_add_link = logger) if res_source == 0: logger.write('%s\n' % src.printcolors.printc(src.OK_STATUS), 5) else: @@ -249,11 +217,24 @@ Use the --force_patch option to overwrite it. if do_patch: msg = _("Patch the product sources (if any) ...") logger.write(msg, 5) - res_patch = runner.patch(args_patch, - logger_add_link = logger) + res_patch = runner.patch(args_patch, logger_add_link = logger) if res_patch == 0: logger.write('%s\n' % src.printcolors.printc(src.OK_STATUS), 5) else: logger.write('%s\n' % src.printcolors.printc(src.KO_STATUS), 5) return res_clean + res_source + res_patch + + +def removeInList(aList, removeList): + """Removes elements of removeList list from aList + + :param aList: (list) The list from which to remove elements + :param removeList: (list) The list which contains elements to remove + :return: (list, list) (list with elements removed, list of elements removed) + """ + res1 = [i for i in aList if i not in removeList] + res2 = [i for i in aList if i in removeList] + return (res1, res2) + + diff --git a/src/ElementTree.py b/src/ElementTree.py index 15d59ca..ef540ee 100644 --- a/src/ElementTree.py +++ b/src/ElementTree.py @@ -902,7 +902,7 @@ class iterparse: def __init__(self, source, events=None): if not hasattr(source, "read"): # OP TEST - print "iterparse.__init__ source = %s" %source + print("iterparse.__init__ source = %s" % source) source = open(source, "rb") self._file = source self._events = [] diff --git a/src/options.py b/src/options.py index b84eae1..911cb71 100755 --- a/src/options.py +++ b/src/options.py @@ -253,7 +253,7 @@ class Options(object): def filterLevel(self, aLevel): """filter level logging values""" - import src.loggingSat as LOG + import src.loggingSimple as LOG aLev = aLevel.upper() knownLevels = LOG._knownLevels maxLen = max([len(i) for i in knownLevels])