CCAR: ajout du repertoire Utilitai dans Cata

ajout du catalogue V6 dans editeur.ini

diff --git a/Aster/alphasdist.py b/Aster/alphasdist.py
index 797380cef4dbe2de22a7e2c1a0ed05e51849c2a2..8618f84275e45ea87fa8449bb87c2b41f9b2d32d 100644 (file)
--- a/Aster/alphasdist.py
+++ b/Aster/alphasdist.py
@@ -43,6 +43,7 @@ def main():
    copyfiles('../Misc',os.path.join(path_distrib,'Misc'),['*.py'])
    copyfiles('../Accas',os.path.join(path_distrib,'Accas'),['*.py'])
    copyfiles('Cata/Macro',os.path.join(path_distrib,'Aster','Cata','Macro'),['*.py'])
+   copyfiles('Cata/Utilitai',os.path.join(path_distrib,'Aster','Cata','Utilitai'),['*.py'])
    copyfiles('Cata/pre74',os.path.join(path_distrib,'Aster','Cata','pre74'),['*.py'])
    copyfiles('Cata/cataSTA5',os.path.join(path_distrib,'Aster','Cata','cataSTA5'),['*.py'])
    copyfiles('Cata/cataSTA6',os.path.join(path_distrib,'Aster','Cata','cataSTA6'),['*.py'])
@@ -109,7 +110,7 @@ def copyfiles(dir_origin,dir_cible,listfiles):
    if not os.path.isdir(dir_cible):make_dir(dir_cible)
    for glob_files in listfiles:
       for file in glob.glob(os.path.join(dir_origin,glob_files)):
-         shutil.copy(file,dir_cible)
+         if os.path.isfile(file):shutil.copy(file,dir_cible)
 
 def maketarball(dir_trav,dir_cible,nom_tar):
    prev=os.getcwd()

diff --git a/Aster/editeur.ini b/Aster/editeur.ini
index 2e145f15b590c6001d89e3f733cf341ffe18fa17..bcb8e43f88a86bb3feb92b52199d4efd9384a958 100644 (file)
--- a/Aster/editeur.ini
+++ b/Aster/editeur.ini
@@ -42,9 +42,9 @@ rep_mat="materiau"
 
 catalogues = (
               #('ASTER','v5',os.path.join(rep_cata,'cataSTA5'),'asterv5'),
-              #('ASTER','v6',os.path.join(rep_cata,'cataSTA6'),'python6'),
+              ('ASTER','v6',os.path.join(rep_cata,'cataSTA6'),'python6'),
               #('ASTER','v73',os.path.join(rep_cata,'cataSTA73'),'python','defaut'),
-              ('ASTER','v74',os.path.join(rep_cata,'cataSTA74'),'python','defaut'),
+              ('ASTER','v74',os.path.join(rep_cata,'cataSTA74'),'python'),
               ('ASTER','v8',os.path.join(rep_cata,'cata_STA8.py'),'python','defaut'),
              )