Ensure jail names return in alphabetical order in status

Primarily to support testing as order can switch
pull/128/merge^2
Steven Hiscocks 2013-02-23 22:06:16 +00:00
parent 53be2ade86
commit 5d0d362e3f
1 changed files with 3 additions and 6 deletions

View File

@ -282,12 +282,9 @@ class Server:
def status(self): def status(self):
try: try:
self.__lock.acquire() self.__lock.acquire()
jailList = '' jails = list(self.__jails.getAll())
for jail in self.__jails.getAll(): jails.sort()
jailList += jail + ', ' jailList = ", ".join(jails)
length = len(jailList)
if not length == 0:
jailList = jailList[:length-2]
ret = [("Number of jail", self.__jails.size()), ret = [("Number of jail", self.__jails.size()),
("Jail list", jailList)] ("Jail list", jailList)]
return ret return ret