minor layout output fix

This commit is contained in:
Bernardo Damele 2012-12-17 13:51:46 +00:00
parent 3c1b696bd6
commit eb44f30d63

View File

@ -451,6 +451,7 @@ class Users:
retrievedUsers = set() retrievedUsers = set()
for user in users: for user in users:
outuser = user
if user in retrievedUsers: if user in retrievedUsers:
continue continue
@ -458,7 +459,7 @@ class Users:
user = "%%%s%%" % user user = "%%%s%%" % user
infoMsg = "fetching number of privileges " infoMsg = "fetching number of privileges "
infoMsg += "for user '%s'" % user infoMsg += "for user '%s'" % outuser
logger.info(infoMsg) logger.info(infoMsg)
if Backend.isDbms(DBMS.MYSQL) and not kb.data.has_information_schema: if Backend.isDbms(DBMS.MYSQL) and not kb.data.has_information_schema:
@ -480,11 +481,11 @@ class Users:
return self.getPrivileges(query2=True) return self.getPrivileges(query2=True)
warnMsg = "unable to retrieve the number of " warnMsg = "unable to retrieve the number of "
warnMsg += "privileges for user '%s'" % user warnMsg += "privileges for user '%s'" % outuser
logger.warn(warnMsg) logger.warn(warnMsg)
continue continue
infoMsg = "fetching privileges for user '%s'" % user infoMsg = "fetching privileges for user '%s'" % outuser
logger.info(infoMsg) logger.info(infoMsg)
privileges = set() privileges = set()
@ -576,7 +577,7 @@ class Users:
kb.data.cachedUsersPrivileges[user] = list(privileges) kb.data.cachedUsersPrivileges[user] = list(privileges)
else: else:
warnMsg = "unable to retrieve the privileges " warnMsg = "unable to retrieve the privileges "
warnMsg += "for user '%s'" % user warnMsg += "for user '%s'" % outuser
logger.warn(warnMsg) logger.warn(warnMsg)
retrievedUsers.add(user) retrievedUsers.add(user)