Fix a traceback when a group has no name and a crash when dns gets interrupted
- http://pastebin.archlinux.fr/449676
This commit is contained in:
parent
2c95177fbe
commit
84887d17af
2 changed files with 19 additions and 4 deletions
|
@ -33,9 +33,16 @@ def main():
|
|||
cocore = singleton.Singleton(core.Core)
|
||||
signal.signal(signal.SIGHUP, cocore.sighup_handler) # ignore ctrl-c
|
||||
cocore.start()
|
||||
if not cocore.xmpp.start(): # Connect to remote server
|
||||
cocore.on_failed_connection()
|
||||
cocore.main_loop() # Refresh the screen, wait for user events etc
|
||||
try:
|
||||
if not cocore.xmpp.start(): # Connect to remote server
|
||||
cocore.on_failed_connection()
|
||||
except:
|
||||
cocore.running = False
|
||||
cocore.reset_curses()
|
||||
print("Poezio could not start, maybe you tried aborting it while it was starting?\n"
|
||||
"If you think it is abnormal, please run it with the -d option and report the bug.")
|
||||
else:
|
||||
cocore.main_loop() # Refresh the screen, wait for user events etc
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
@ -95,7 +95,15 @@ class Roster(object):
|
|||
|
||||
def get_groups(self, sort=''):
|
||||
"""Return a list of the RosterGroups"""
|
||||
group_list = sorted(filter(lambda x: bool(x), self.groups.values()), key=lambda x: x.name.lower())
|
||||
group_list = sorted(
|
||||
filter(
|
||||
lambda x: bool(x),
|
||||
self.groups.values()
|
||||
),
|
||||
key=lambda x: x.name.lower() if x.name else ''
|
||||
)
|
||||
|
||||
log.debug("Current groups: %s", group_list)
|
||||
|
||||
for sorting in sort.split(':'):
|
||||
if sorting == 'reverse':
|
||||
|
|
Loading…
Reference in a new issue