@@ -198,7 +198,7 @@ def do_show(self, args):
198
198
for component in components :
199
199
record = []
200
200
if rDict [compType ][system ][component ]["Installed" ]:
201
- module = str (rDict [compType ][system ][component ]["Module " ])
201
+ module = str (rDict [compType ][system ][component ]["DIRACModule " ])
202
202
record += [system , component , module , compType .lower ()[:- 1 ]]
203
203
if rDict [compType ][system ][component ]["Setup" ]:
204
204
record += ["Setup" ]
@@ -213,7 +213,7 @@ def do_show(self, args):
213
213
record += [str (rDict [compType ][system ][component ]["PID" ])]
214
214
records .append (record )
215
215
printTable (fields , records )
216
- elif option == "database" or option == "databases" :
216
+ elif option in ( "database" , "databases" ) :
217
217
client = SystemAdministratorClient (self .host , self .port )
218
218
if not gComponentInstaller .mysqlPassword :
219
219
gComponentInstaller .mysqlPassword = "LocalConfig"
@@ -457,9 +457,9 @@ def getInstallations(self, argss):
457
457
elif arg == "-t" :
458
458
key = "Component.Type"
459
459
elif arg == "-m" :
460
- key = "Component.Module "
460
+ key = "Component.DIRACModule "
461
461
elif arg == "-s" :
462
- key = "Component.System "
462
+ key = "Component.DIRACSystem "
463
463
elif arg == "-h" :
464
464
key = "Host.HostName"
465
465
elif arg == "-n" :
0 commit comments