Merge pull request #5 from boegel/generaloption

fixing remarks

easybuild/framework/extensioneasyblock.py

@@ -22,7 +22,7 @@
 EasyBuild support for building and installing extensions as actual extensions or as stand-alone modules,
 implemented as an easyblock
 
-@authors: Kenneth Hoste (Ghent University)
+@author: Kenneth Hoste (Ghent University)
 """
 import copy
 import os

easybuild/main.py

@@ -104,9 +104,9 @@ def parse_options(args=None, logfile=None):
     (options, paths, opt_parser) = eboptions.parse_options(args=args)
 
     if not logfile:
-       # mkstemp returns (fd,filename), fd is from os.open, not regular open!
-       fd, logfile = tempfile.mkstemp(suffix='.log', prefix='easybuild-')
-       os.close(fd)
+        # mkstemp returns (fd,filename), fd is from os.open, not regular open!
+        fd, logfile = tempfile.mkstemp(suffix='.log', prefix='easybuild-')
+        os.close(fd)
 
     if options.logtostdout:
         if os.path.exists(logfile):
@@ -267,7 +267,7 @@ def main(args=None, keep_logs=False, logfile=None, exit_on_error=True):
 
     if any([options.avail_easyconfig_params, options.list_easyblocks, options.list_toolchains, options.search,
              options.version, options.regtest]):
-        if logfile and not keep_log:
+        if logfile and not keep_logs:
             os.remove(logfile)
         sys.exit(0)
 
@@ -393,7 +393,7 @@ def main(args=None, keep_logs=False, logfile=None, exit_on_error=True):
     try:
         remove_log_handler(hn)
         hn.close()
-        if logfile and not keep_log:
+        if logfile and not keep_logs:
             os.remove(logfile)
 
         for ec in easyconfigs:
@@ -403,10 +403,10 @@ def main(args=None, keep_logs=False, logfile=None, exit_on_error=True):
     except IOError, err:
         error("Something went wrong closing and removing the log %s : %s" % (logfile, err))
 
-    if keep_log:
+    if keep_logs:
         return logfile
 
-def error(message, log, exitCode=1, opt_parser=None, exit_on_error=True):
+def error(message, log=None, exitCode=1, opt_parser=None, exit_on_error=True):
     """
     Print error message and exit EasyBuild
     """
@@ -416,7 +416,7 @@ def error(message, log, exitCode=1, opt_parser=None, exit_on_error=True):
             opt_parser.print_shorthelp()
             print_msg("ERROR: %s\n" % message)
         sys.exit(exitCode)
-    else:
+    elif log:
         log.error(message)
 
 def warning(message):

easybuild/test/options.py

@@ -93,7 +93,7 @@ def test_no_args(self):
         os.close(fd)
 
         try:
-            logf = main(args=[], exit_on_error=False, logfile=logfile)
+            main(args=[], exit_on_error=False, logfile=logfile, keep_logs=True)
         except:
             pass
         outtxt = open(logfile, 'r').read()

easybuild/toolchains/iiqmpi.py

@@ -25,7 +25,7 @@
 """
 EasyBuild support for iiqmpi compiler toolchain (includes Intel compilers, QLogicMPI).
 
-@authors: Kenneth Hoste (UGent)
+@author: Kenneth Hoste (Ghent University)
 """
 
 from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort

easybuild/toolchains/iqacml.py

@@ -25,7 +25,7 @@
 """
 EasyBuild support for iqacml compiler toolchain (includes Intel compilers, QLogicMPI, ACML, BLACS, ScaLAPACK and FFTW).
 
-@authors: Kenneth Hoste (UGent)
+@author: Kenneth Hoste (Ghent University)
 """
 
 from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort

easybuild/tools/build_log.py

@@ -142,7 +142,7 @@ def init_logger(name=None, version=None, debug=False, filename=None, typ='UNKNOW
             filename = log_filename(name, version)
         hand = fancylogger.logToFile(filename, name=typ)
     else:
-        hand = fancylogger.logToScreen(True)
+        hand = fancylogger.logToScreen(True, name=typ)
 
     # initialize our logger
     log = fancylogger.getLogger(typ)

easybuild/tools/module_generator.py

@@ -25,12 +25,12 @@
 """
 Generating module files.
 
-@authors: Stijn De Weirdt (UGent)
-@authors: Dries Verdegem (UGent)
-@authors: Kenneth Hoste (UGent)
-@authors: Pieter De Baets (UGent)
-@authors: Jens Timmerman (UGent)
-@authors: Fotis Georgatos (Uni.Lu)
+@author: Stijn De Weirdt (Ghent University)
+@author: Dries Verdegem (Ghent University)
+@author: Kenneth Hoste (Ghent University)
+@author: Pieter De Baets (Ghent University)
+@author: Jens Timmerman (Ghent University)
+@author: Fotis Georgatos (Uni.Lu)
 """
 import os
 import shutil

easybuild/tools/utilities.py

@@ -25,7 +25,7 @@
 """
 Module with various utility functions
 
-@authors: Kenneth Hoste (UGent)
+@author: Kenneth Hoste (Ghent University)
 """
 
 # FIXME: remove when Python version on which we rely provides any by itself