Merge remote-tracking branch 'progval/testing' into testing

This commit is contained in:
Mika Suomalainen 2011-08-10 13:02:18 +03:00
commit 618200ca50
2 changed files with 11 additions and 5 deletions

View File

@ -30,6 +30,7 @@
import re
import time
import copy
import config
@ -78,7 +79,7 @@ class Services(callbacks.Plugin):
if self.registryValue('noJoinsUntilIdentified'):
self.log.info('Holding JOIN to %s until identified.',
msg.args[0])
self.waitingJoins.append(msg)
self.waitingJoins.append((irc.network, msg,))
return None
return msg
@ -316,9 +317,14 @@ class Services(callbacks.Plugin):
for channel in self.channels:
irc.queueMsg(networkGroup.channels.join(channel))
if self.waitingJoins:
for m in self.waitingJoins:
tmp_wj = copy.deepcopy(self.waitingJoins) # can't iterate over list if we're modifying it
for netname, m in tmp_wj:
if netname == irc.network:
irc.sendMsg(m)
self.waitingJoins = []
try:
self.waitingJoins.remove((netname, m,))
except ValueError:
pass # weird stuff happen sometimes
elif 'not yet authenticated' in s:
# zirc.org has this, it requires an auth code.
email = s.split()[-1]

View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change
them once."""
version = '0.83.4.1+limnoria (2011-08-10T11:48:07+0200)'
version = '0.83.4.1+limnoria (2011-08-10T12:00:42+0200)'