From 79b48b152f6230b26c91cec41577c2c9454e172d Mon Sep 17 00:00:00 2001 From: aldbr Date: Thu, 8 Feb 2024 11:57:17 +0100 Subject: [PATCH] fix: dirac-proxy-init printInfo --- .../scripts/dirac_proxy_init.py | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py b/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py index cf31864c02a..d3d5e1e391d 100755 --- a/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py +++ b/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py @@ -163,22 +163,19 @@ def printInfo(self): if self.__uploadedInfo: gLogger.notice("\nProxies uploaded:") maxDNLen = 0 - maxGroupLen = 0 for userDN in self.__uploadedInfo: maxDNLen = max(maxDNLen, len(userDN)) - for group in self.__uploadedInfo[userDN]: - maxGroupLen = max(maxGroupLen, len(group)) - gLogger.notice(f" {'DN'.ljust(maxDNLen)} | {'Group'.ljust(maxGroupLen)} | Until (GMT)") + + gLogger.notice(f" {'DN'.ljust(maxDNLen)} | Until (GMT)") for userDN in self.__uploadedInfo: - for group in self.__uploadedInfo[userDN]: - gLogger.notice( - " %s | %s | %s" - % ( - userDN.ljust(maxDNLen), - group.ljust(maxGroupLen), - self.__uploadedInfo[userDN][group].strftime("%Y/%m/%d %H:%M"), - ) - ) + # in v8.0, expirationTime is accessed from uploadedInfo[userDN][""] + if isinstance(self.__uploadedInfo[userDN], dict): + expirationTime = self.__uploadedInfo[userDN][""] + # whereas in v9.0, expirationTime is accessed from uploadedInfo[userDN] + else: + expirationTime = self.__uploadedInfo[userDN] + + gLogger.notice(f" {userDN.ljust(maxDNLen)} | {expirationTime.strftime('%Y/%m/%d %H:%M')}") def checkCAs(self): caDir = getCAsLocation()