Upgrade to 1.2.4.

3 files changed, 38 insertions, 5 deletions

diff --git a/cad/astk-serveur/files/patch-conf::config b/cad/astk-serveur/files/patch-conf::config
index 3fcd224..c58a4b3 100644
--- a/cad/astk-serveur/files/patch-conf::config
+++ b/cad/astk-serveur/files/patch-conf::config
@@ -1,6 +1,17 @@
 --- conf/config.orig	Fri Jan  7 09:10:16 2005
-+++ conf/config	Sun Jan  9 22:15:57 2005
-@@ -68,6 +68,7 @@
++++ conf/config	Sat Jul  2 20:44:10 2005
+@@ -49,6 +49,10 @@
+ # temporary directory for Aster executions
+ rep_trav : /tmp
+ 
++# directories for tests
++rep_test : /tmp
++resu_test : /tmp
++
+ # choose True to create symbolic links instead of copying executable and catalogs
+ symlink : True
+ 
+@@ -68,6 +72,7 @@
  # for each version a config.VVV file must be created.
  # DO NOT EDIT FOLLOWING LINE !
  #?vers : VVV?
@@ -8,7 +19,7 @@
  
  #-------------------------------------------------------------------------------
  # ----- batch/interactive configuration
-@@ -106,12 +107,12 @@
+@@ -106,12 +111,12 @@
  # batch_job : to display information about jobs
  # batch_kil : to delete jobs
  # --- Sun Grid Engine example
@@ -27,7 +38,7 @@
  
  # --- LSF example
  #batch_nom : LSF
-@@ -122,18 +123,21 @@
+@@ -122,18 +127,21 @@
  #batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
  
  # --- PBS example
@@ -54,7 +65,7 @@
  # TRU64 :
  #?TRU64?ps_cpu : /bin/ps -e -ocputime -ocommand
  #?TRU64?ps_pid : /bin/ps -e -opid -ocommand
-@@ -157,6 +161,7 @@
+@@ -157,6 +165,7 @@
  # GDB :
  #?P_LINUX?cmd_post : gdb -batch --command=@D @E @C
  #?P_LINUX?cmd_dbg : ddd --debugger gdb --command=@D @E @C
diff --git a/cad/astk-serveur/files/patch-lib__as_exec.py b/cad/astk-serveur/files/patch-lib__as_exec.py
new file mode 100644
index 0000000..4abe073
--- /dev/null
+++ b/cad/astk-serveur/files/patch-lib__as_exec.py
@@ -0,0 +1,11 @@
+--- ./lib/as_exec.py.orig	Tue Jun 28 12:56:13 2005
++++ ./lib/as_exec.py	Sat Jul  2 22:34:46 2005
+@@ -397,7 +397,7 @@
+ --- Results :
+ """)
+       info_start=( nbtest, time.strftime('%c'),
+-         os.path.join(REPREF,conf['SRCTEST'][0]), ', '.join(reptest), resutest,
++         os.path.join(REPREF,conf['SRCTEST'][0]), reptest, resutest,
+          prof['version'][0], exetmp, cmdetmp, eletmp,
+          nbmaxnook, cpresok, facmtps )
+       print summary % info_start
diff --git a/cad/astk-serveur/files/patch-lib__as_system.py b/cad/astk-serveur/files/patch-lib__as_system.py
new file mode 100644
index 0000000..2437cbb
--- /dev/null
+++ b/cad/astk-serveur/files/patch-lib__as_system.py
@@ -0,0 +1,11 @@
+--- ./lib/as_system.py.orig	Tue Jun 28 12:56:13 2005
++++ ./lib/as_system.py	Sun Jul  3 18:02:43 2005
+@@ -597,7 +597,7 @@
+          self._mess(_('error getting environment'), '<E>_ABNORMAL_ABORT')
+          return
+       # read profile and dump modified environment
+-      iret, out = self.Shell('sh -c "source '+profile+' ; env"')
++      iret, out = self.Shell('sh -c ". '+profile+' ; env"')
+       env_prof = env2dict(out)
+       if iret<>0:
+          self._mess(_('error reading profile : %s') % profile,