X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=commands%2Flog.py;h=c7e46020dcead744c65abd8460d3b66bca8baa2f;hb=ca89ddf7fe63332575a5a540034ce590c8f9089b;hp=31d93e0053cbc92ee3d1afac57811c1002469442;hpb=252082b43d23f41ed948c6e18012b053dbe646a1;p=tools%2Fsat.git

diff --git a/commands/log.py b/commands/log.py
index 31d93e0..c7e4602 100644
--- a/commands/log.py
+++ b/commands/log.py
@@ -1,5 +1,20 @@
 #!/usr/bin/env python
 #-*- coding:utf-8 -*-
+#  Copyright (C) 2010-2012  CEA/DEN
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 import os
 import shutil
@@ -49,6 +64,11 @@ def get_last_log_file(logDir, notShownCommands):
     return os.path.join(logDir, last[0])
 
 def remove_log_file(filePath, logger):
+    '''if it exists, print a warning and remove the input file
+    
+    :param filePath: the path of the file to delete
+    :param logger Logger: the logger instance to use for the print 
+    '''
     if os.path.exists(filePath):
         logger.write(src.printcolors.printcWarning("Removing ")
                      + filePath + "\n", 5)
@@ -118,9 +138,7 @@ def run(args, runner, logger):
     (options, args) = parser.parse_args(args)
 
     # get the log directory. 
-    # If there is an application, it is in cfg.APPLICATION.out_dir, 
-    # else in user directory
-    logDir = runner.cfg.SITE.log.logDir
+    logDir = runner.cfg.SITE.log.log_dir
 
     # If the clean options is invoked, 
     # do nothing but deleting the concerned files.
@@ -155,7 +173,7 @@ def run(args, runner, logger):
         return 0 
 
     # determine the commands to show in the hat log
-    notShownCommands = runner.cfg.INTERNAL.log.notShownCommands
+    notShownCommands = runner.cfg.INTERNAL.log.not_shown_commands
     if options.full:
         notShownCommands = []
 
@@ -219,7 +237,7 @@ def run(args, runner, logger):
                     
     # Create or update the hat xml that gives access to all the commands log files
     xmlHatFilePath = os.path.join(logDir, 'hat.xml')
-    src.logger.update_hat_xml(runner.cfg.SITE.log.logDir, 
+    src.logger.update_hat_xml(runner.cfg.SITE.log.log_dir, 
                               application = runner.cfg.VARS.application, 
                               notShownCommands = notShownCommands)