ajout d'un répertoire TMP pour sat

diff --git a/commands/config.py b/commands/config.py
index c089074dc8fec98974bbd2959041db698cde0fd6..3d314e376586681bdfe504ee2d0c7432b4642d98 100644 (file)
--- a/commands/config.py
+++ b/commands/config.py
@@ -302,7 +302,8 @@ class ConfigManager:
             cfg.LOCAL.workdir = os.path.abspath(osJoin(cfg.VARS.salometoolsway, ".."))
         if cfg.LOCAL.log_dir == "default":
             cfg.LOCAL.log_dir = os.path.abspath(osJoin(cfg.VARS.salometoolsway, "..", "LOGS"))
-
+        if cfg.LOCAL.tmp_dir == "default":
+            cfg.LOCAL.tmp_dir = os.path.abspath(osJoin(cfg.VARS.salometoolsway, "..", "TMP"))
         if cfg.LOCAL.archive_dir == "default":
             cfg.LOCAL.archive_dir = os.path.abspath( osJoin(cfg.VARS.salometoolsway, "..", "ARCHIVES"))
 

diff --git a/commands/init.py b/commands/init.py
index 592843a5163a208d0f754ec4266f64efb84f6e15..7ef409c26ed79be77478cf8bb200689e3018966e 100644 (file)
--- a/commands/init.py
+++ b/commands/init.py
@@ -41,6 +41,8 @@ parser.add_option('t', 'tag', 'string', 'tag',
                   _('Optional: The tag of SAT (only informative)'))
 parser.add_option('l', 'log_dir', 'string', 'log_dir', 
                   _('Optional: The directory where to put all the logs of SAT'))
+parser.add_option('', 'tmp_dir', 'string', 'tmp_dir', 
+                  _('Optional: The temporary directory used by SAT'))
 
 def set_local_value(config, key, value, logger):
     """ Edit the site.pyconf file and change a value.
@@ -143,6 +145,7 @@ def display_local_values(config, logger):
             ("workdir", config.LOCAL.workdir),
             ("log_dir", config.LOCAL.log_dir),
             ("archive_dir", config.LOCAL.archive_dir),
+            ("tmp_dir", config.LOCAL.tmp_dir),
             ("VCS", config.LOCAL.VCS),
             ("tag", config.LOCAL.tag),
             ("projects", config.PROJECTS.project_file_paths)]
@@ -207,6 +210,7 @@ def run(args, runner, logger):
     for opt in [("base" , options.base),
                 ("workdir", options.workdir),
                 ("log_dir", options.log_dir),
+                ("tmp_dir", options.tmp_dir),
                 ("archive_dir", options.archive_dir)]:
         key, value = opt
         if value:

diff --git a/commands/package.py b/commands/package.py
index f4b226d656b6e1288e5c52a591fe09792fb012b7..9ed100a39277309651878e5eec68bcc37ebebd0d 100644 (file)
--- a/commands/package.py
+++ b/commands/package.py
@@ -73,6 +73,7 @@ LOCAL_TEMPLATE = ("""#!/usr/bin/env python
     workdir : 'default'
     log_dir : 'default'
     archive_dir : 'default'
+    tmp_dir : 'default'
     VCS : None
     tag : None
   }
@@ -1163,6 +1164,7 @@ def sat_package(config, tmp_working_dir, options, logger):
     local_cfg.LOCAL["workdir"] = "default"
     local_cfg.LOCAL["log_dir"] = "default"
     local_cfg.LOCAL["archive_dir"] = "default"
+    local_cfg.LOCAL["tmp_dir"] = "default"
     local_cfg.LOCAL["VCS"] = "None"
     local_cfg.LOCAL["tag"] = src.get_salometool_version(config)
 

diff --git a/complete_sat.sh b/complete_sat.sh
index 5e68e4259e78d28960ddf2b473e4327e90fe437c..7ce15a15c69e8c42f75bd4d547171f800fb070c7 100755 (executable)
--- a/complete_sat.sh
+++ b/complete_sat.sh
@@ -59,7 +59,7 @@ _show_applications()
             opts2=$(echo --set $opts2)
             ;;
         init)
-            opts2=$(echo --base --workdir --VCS --tag --log_dir --add_project --reset_projects $opts2)
+            opts2=$(echo --base --workdir --VCS --tag --log_dir --tmp_dir --add_project --reset_projects $opts2)
             ;;
     esac
 

diff --git a/data/local.pyconf b/data/local.pyconf
index 7755af0b81ad5dc0712286e6f49ca3eaa3d520e8..aee5fdb89fff47bb393de9270a9f1c5859cb5a5e 100644 (file)
--- a/data/local.pyconf
+++ b/data/local.pyconf
@@ -5,6 +5,7 @@
     workdir : 'default'
     log_dir : 'default'
     archive_dir : 'default'
+    tmp_dir : 'default'
     VCS : None
     tag : None
   }