File tree Expand file tree Collapse file tree 1 file changed +10
-13
lines changed
src/DIRAC/FrameworkSystem/scripts Expand file tree Collapse file tree 1 file changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -163,22 +163,19 @@ def printInfo(self):
163
163
if self .__uploadedInfo :
164
164
gLogger .notice ("\n Proxies uploaded:" )
165
165
maxDNLen = 0
166
- maxGroupLen = 0
167
166
for userDN in self .__uploadedInfo :
168
167
maxDNLen = max (maxDNLen , len (userDN ))
169
- for group in self .__uploadedInfo [userDN ]:
170
- maxGroupLen = max (maxGroupLen , len (group ))
171
- gLogger .notice (f" { 'DN' .ljust (maxDNLen )} | { 'Group' .ljust (maxGroupLen )} | Until (GMT)" )
168
+
169
+ gLogger .notice (f" { 'DN' .ljust (maxDNLen )} | Until (GMT)" )
172
170
for userDN in self .__uploadedInfo :
173
- for group in self .__uploadedInfo [userDN ]:
174
- gLogger .notice (
175
- " %s | %s | %s"
176
- % (
177
- userDN .ljust (maxDNLen ),
178
- group .ljust (maxGroupLen ),
179
- self .__uploadedInfo [userDN ][group ].strftime ("%Y/%m/%d %H:%M" ),
180
- )
181
- )
171
+ # in v8.0, expirationTime is accessed from uploadedInfo[userDN][""]
172
+ if isinstance (self .__uploadedInfo [userDN ], dict ):
173
+ expirationTime = self .__uploadedInfo [userDN ]["" ]
174
+ # whereas in v9.0, expirationTime is accessed from uploadedInfo[userDN]
175
+ else :
176
+ expirationTime = self .__uploadedInfo [userDN ]
177
+
178
+ gLogger .notice (f" { userDN .ljust (maxDNLen )} | { expirationTime .strftime ('%Y/%m/%d %H:%M' )} " )
182
179
183
180
def checkCAs (self ):
184
181
caDir = getCAsLocation ()
You can’t perform that action at this time.
0 commit comments