From ed2bc165d012e2bb5448cbe6fb4a0c65265d305e Mon Sep 17 00:00:00 2001 From: tmaeno Date: Thu, 20 Jun 2024 13:06:27 +0200 Subject: [PATCH] warning message for missing nickname in IAM --- ChangeLog.txt | 3 +++ pandaclient/Client.py | 11 +++++------ pandaclient/PandaToolsPkgInfo.py | 2 +- pandaclient/PsubUtils.py | 4 +--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 896322d..a684c80 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,8 @@ ** Release Notes +1.5.75 + * warning message for missing nickname in IAM + 1.5.74 * added support for D2AODs in pathena diff --git a/pandaclient/Client.py b/pandaclient/Client.py index c043ab0..0021dcd 100755 --- a/pandaclient/Client.py +++ b/pandaclient/Client.py @@ -1603,14 +1603,13 @@ def get_cert_attributes(verbose=False): return EC_Failed, msg else: d = dict() - for l in output.split("\n"): - if ":" not in l: + for line in output.split("\n"): + if ":" not in line: continue - l = l.encode("utf-8") - print(l) - if not l.startswith("GRST_CRED"): + print(line) + if not line.startswith("GRST_CRED"): continue - items = l.split(":") + items = line.split(":") d[items[0].strip()] = items[1].strip() return 0, d except Exception as e: diff --git a/pandaclient/PandaToolsPkgInfo.py b/pandaclient/PandaToolsPkgInfo.py index cb41935..2657678 100644 --- a/pandaclient/PandaToolsPkgInfo.py +++ b/pandaclient/PandaToolsPkgInfo.py @@ -1 +1 @@ -release_version = "1.5.74" +release_version = "1.5.75" diff --git a/pandaclient/PsubUtils.py b/pandaclient/PsubUtils.py index 9738708..1a9804c 100644 --- a/pandaclient/PsubUtils.py +++ b/pandaclient/PsubUtils.py @@ -161,9 +161,7 @@ def getNickname(verbose=False): tmpLog = PLogger.getPandaLogger() wMessage = "Could not get nickname by using voms-proxy-info which gave\n\n" wMessage += output - wMessage += "\nPlease register nickname to ATLAS VO via\n\n" - wMessage += " https://lcg-voms2.cern.ch:8443/voms/atlas/vomrs\n" - wMessage += " [Member Info] -> [Edit Personal Info]" + wMessage += "\nPlease contact VO Admins using project-lcg-vo-atlas-admin@cern.ch mailing list to register nickname in IAM" print("") tmpLog.warning(wMessage) print("")