aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Schneider <nils@nilsschneider.net>2014-05-02 08:55:19 +0200
committerNils Schneider <nils@nilsschneider.net>2014-05-02 08:55:19 +0200
commitb3a921347c7a15aae6e62e163e0d99adab684ce6 (patch)
tree3c7ad6da4ec4a6f9d31478113222cfeebd608177
parentac3366ff13f9cf71452d50aa6d2263f07a81c26c (diff)
parent605765cd12036a58785aa7098b524ee93beca523 (diff)
Merge pull request #26 from T-X/for-upstream
try non-fuzzy prior fuzzy mac matching
-rw-r--r--nodedb.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/nodedb.py b/nodedb.py
index f1110aa..6a4726f 100644
--- a/nodedb.py
+++ b/nodedb.py
@@ -169,12 +169,15 @@ class NodeDB:
def import_aliases(self, aliases):
for mac, alias in aliases.items():
try:
- node = self.maybe_node_by_fuzzy_mac(mac)
+ node = self.maybe_node_by_mac([mac])
except:
- # create an offline node
- node = Node()
- node.add_mac(mac)
- self._nodes.append(node)
+ try:
+ node = self.maybe_node_by_fuzzy_mac(mac)
+ except:
+ # create an offline node
+ node = Node()
+ node.add_mac(mac)
+ self._nodes.append(node)
if 'name' in alias:
node.name = alias['name']