From b40946fe6480f67589c88a735ba6488bcbac331c Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Thu, 10 Nov 2022 15:26:35 +0100
Subject: [PATCH] Fix user friendliness
---
atdb/main.py | 8 +++++---
atdb/prune.py | 5 ++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/atdb/main.py b/atdb/main.py
index cf3734a..7c3b904 100644
--- a/atdb/main.py
+++ b/atdb/main.py
@@ -23,10 +23,12 @@ def read_conf_file(args: Namespace, additional_location=None):
"""
parser = ConfigParser()
if additional_location is not None:
- parser.read(additional_location)
+ read_files = parser.read(additional_location)
else:
- parser.read(DEFAULT_PATH)
+ read_files = parser.read(DEFAULT_PATH)
+ if not read_files and (args.atdb_site is None or args.token is None):
+ raise SystemError('Missing configuration file')
global_config = parser["ATDB"]
if "url" in global_config:
args.atdb_site = parser["ATDB"]["url"]
@@ -35,7 +37,7 @@ def read_conf_file(args: Namespace, additional_location=None):
return args
-def parse_args() -> Namespace:
+def parse_args() -> (Namespace, ArgumentParser):
"""
Parse command line arguments
"""
diff --git a/atdb/prune.py b/atdb/prune.py
index cb9b594..f8e235f 100644
--- a/atdb/prune.py
+++ b/atdb/prune.py
@@ -88,4 +88,7 @@ def prune(args):
)
remove_surl_locations(surls_to_remove, dry_run=args.dry_run)
- logger.info("Successfully removed %s files", len(surls_to_remove))
+ if args.dry_run:
+ logger.info("[dry-run] Successfully removed %s files", len(surls_to_remove))
+ else:
+ logger.info("Successfully removed %s files", len(surls_to_remove))
\ No newline at end of file
--
GitLab