From 95245101cbaa680c4d7b52c4cb1d5241c63bd307 Mon Sep 17 00:00:00 2001 From: Christian Van Wambeke Date: Fri, 23 Mar 2018 15:54:18 +0100 Subject: [PATCH] get_archives_vcs big files not in /tmp but in APPLICATION.workdir + /tmp_package --- commands/package.py | 7 ++++--- commands/prepare.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/commands/package.py b/commands/package.py index 1a16253..5a2c493 100644 --- a/commands/package.py +++ b/commands/package.py @@ -753,7 +753,7 @@ def get_archives_vcs(l_pinfo_vcs, sat, config, logger, tmp_working_dir): # clean the source directory of all the vcs products, then use the source # command and thus construct an archive that will not contain the patches l_prod_names = [pn for pn, __ in l_pinfo_vcs] - if False: # clean is dangerous in user/SOURCES, fixed in tmp_working_dir + if False: # clean is dangerous in user/SOURCES, fixed in tmp_local_working_dir logger.write(_("\nclean sources\n")) args_clean = config.VARS.application args_clean += " --sources --products " @@ -767,7 +767,8 @@ def get_archives_vcs(l_pinfo_vcs, sat, config, logger, tmp_working_dir): args_source += " --products " args_source += ",".join(l_prod_names) svgDir = sat.cfg.APPLICATION.workdir - sat.cfg.APPLICATION.workdir = tmp_working_dir + tmp_local_working_dir = os.path.join(sat.cfg.APPLICATION.workdir, "tmp_package") # to avoid too much big files in /tmp + sat.cfg.APPLICATION.workdir = tmp_local_working_dir # DBG.write("SSS sat config.APPLICATION.workdir", sat.cfg.APPLICATION, True) # DBG.write("sat config id", id(sat.cfg), True) # shit as config is not same id() as for sat.source() @@ -778,7 +779,7 @@ def get_archives_vcs(l_pinfo_vcs, sat, config, logger, tmp_working_dir): # make the new archives d_archives_vcs = {} for pn, pinfo in l_pinfo_vcs: - path_archive = make_archive(pn, pinfo, tmp_working_dir) + path_archive = make_archive(pn, pinfo, tmp_local_working_dir) logger.write("make archive vcs '%s'\n" % path_archive) d_archives_vcs[pn] = (path_archive, os.path.join(ARCHIVE_DIR, pn + ".tgz")) diff --git a/commands/prepare.py b/commands/prepare.py index ddd0de3..fc40f64 100644 --- a/commands/prepare.py +++ b/commands/prepare.py @@ -76,7 +76,7 @@ def remove_products(arguments, l_products_info, logger): args = str(arguments) #copy of "--products ,XDATA,TESSCODE,cmake" for example largs = args.split(',') DBG.write("largs", largs) - toRemove = [name for name,_ in l_products_info] + toRemove = [name for name, xx in l_products_info] DBG.write("remove_products", toRemove) removed = [] notRemoved = [] -- 2.39.2