From 605765cd12036a58785aa7098b524ee93beca523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de>
Date: Fri, 2 May 2014 04:08:23 +0200
Subject: [PATCH] try non-fuzzy prior fuzzy mac matching

Fuzzy matching should only be tried if there's no exact match. Otherwise
a node in the map might get the wrong label.
---
 nodedb.py | 13 ++++++++-----
 1 file 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']