This commit is contained in:
Nils Schneider 2012-06-04 19:02:12 +02:00
parent bc4b90c4ed
commit eba95718cb

View file

@ -190,11 +190,12 @@ class NodeDB:
macs = [s for s in [s.strip() for s in node['MAC'].split(',')] if s] macs = [s for s in [s.strip() for s in node['MAC'].split(',')] if s]
gps = [s for s in [s.strip() for s in node['GPS'].split(',')] if s] gps = [s for s in [s.strip() for s in node['GPS'].split(',')] if s]
zipped = zip(macs, gps)
if 'Nick' in node: if 'Nick' in node:
names = [s for s in [s.strip() for s in node['Nick'].split(',')] if s] names = [s for s in [s.strip() for s in node['Nick'].split(',')] if s]
if names:
zipped = zip(macs, gps, names) zipped = zip(macs, gps, names)
else:
zipped = zip(macs, gps)
for pair in zipped: for pair in zipped:
try: try: