Bmng dev master #687

Merged
Atheros1 merged 12 commits from bmng-dev-master into master 2014-07-15 01:42:36 +02:00
Showing only changes of commit 1f9991bcd0 - Show all commits

View File

@ -505,8 +505,10 @@ class receiveDataThread(threading.Thread):
# pubkeyrequest?? # pubkeyrequest??
if objectType == 'pubkeyrequest': if objectType == 'pubkeyrequest':
objectType = 'getpubkey' objectType = 'getpubkey'
elif objectType != 'pubkey' and objectType != 'getpubkey' and elif (objectType != 'pubkey' and
objectType != 'msg' and objectType != 'broadcast': objectType != 'getpubkey' and
objectType != 'msg' and
objectType != 'broadcast'):
sys.stderr.write( sys.stderr.write(
'Error: sendData has been asked to send a strange objectType: %s\n' % str(objectType)) 'Error: sendData has been asked to send a strange objectType: %s\n' % str(objectType))
return return