From 1f64ab73e594d0149918814037fb7f45946b0290 Mon Sep 17 00:00:00 2001 From: Konstantin Leontev Date: Wed, 14 Dec 2022 16:43:58 +0300 Subject: [PATCH] [bos #32522][EDF] SALOME on Demand. Small refact: changed log output, edit docstrings. --- bin/SalomeOnDemandTK/extension_builder.py | 3 --- bin/SalomeOnDemandTK/extension_query.py | 6 ++++-- bin/SalomeOnDemandTK/extension_remover.py | 4 ++-- bin/SalomeOnDemandTK/extension_unpacker.py | 4 ---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/bin/SalomeOnDemandTK/extension_builder.py b/bin/SalomeOnDemandTK/extension_builder.py index d1b8b3113..59bf47ae1 100644 --- a/bin/SalomeOnDemandTK/extension_builder.py +++ b/bin/SalomeOnDemandTK/extension_builder.py @@ -85,9 +85,6 @@ def create_salomex(salomexb, salomexd, env_py, top_repository): env_py - a path to the _env.py file. top_repository - a root directory for all the paths listed inside salomexb file. - Raises: - Raises OSError exception. - Returns: None. """ diff --git a/bin/SalomeOnDemandTK/extension_query.py b/bin/SalomeOnDemandTK/extension_query.py index 216fdd739..600a9d30a 100644 --- a/bin/SalomeOnDemandTK/extension_query.py +++ b/bin/SalomeOnDemandTK/extension_query.py @@ -156,7 +156,7 @@ def size_bylist(root_dir, salomexc): continue else: - logger.error('Unexpected path %s ' + logger.warning('Unexpected path %s ' 'is not a file, link or directory. Skip.', path_to_file) @@ -269,4 +269,6 @@ if __name__ == '__main__': ext_size_str(arg_1, arg_2) else: logger.error('You must provide all the arguments!') - logger.info(dir_size.__doc__) + logger.info(dir_size_str.__doc__) + logger.info(dependency_tree.__doc__) + logger.info(ext_size_str.__doc__) diff --git a/bin/SalomeOnDemandTK/extension_remover.py b/bin/SalomeOnDemandTK/extension_remover.py index d0b6d1dc8..0d3124c5b 100644 --- a/bin/SalomeOnDemandTK/extension_remover.py +++ b/bin/SalomeOnDemandTK/extension_remover.py @@ -112,7 +112,7 @@ def remove_bylist(root_dir, salomexc): shutil.rmtree(path_to_remove) else: - logger.error('Unexpected path %s!' + logger.warning('Unexpected path %s!' 'It is not a file or directory. Skip.', path_to_remove) @@ -177,7 +177,7 @@ def remove_salomex(install_dir, salomex_name): if env_py: os.remove(env_py) else: - logger.error('Cannot find and remove %s file! ', env_py) + logger.warning('Cannot find and remove %s file! ', env_py) # Remove description file if salomexd: diff --git a/bin/SalomeOnDemandTK/extension_unpacker.py b/bin/SalomeOnDemandTK/extension_unpacker.py index b8ad07a4b..47355b772 100644 --- a/bin/SalomeOnDemandTK/extension_unpacker.py +++ b/bin/SalomeOnDemandTK/extension_unpacker.py @@ -49,10 +49,6 @@ def unpack_salomex(salome_root, salomex): salome_root - path to SALOME install root directory. salomex - a given salomex file to unpack. - Raises: - OSError exception. - KeyError exception if a file can not be found in the archive. - Returns: None. """ -- 2.39.2