diff options
author | Nils Schneider <nils@nilsschneider.net> | 2014-05-02 08:55:19 +0200 |
---|---|---|
committer | Nils Schneider <nils@nilsschneider.net> | 2014-05-02 08:55:19 +0200 |
commit | b3a921347c7a15aae6e62e163e0d99adab684ce6 (patch) | |
tree | 3c7ad6da4ec4a6f9d31478113222cfeebd608177 | |
parent | ac3366ff13f9cf71452d50aa6d2263f07a81c26c (diff) | |
parent | 605765cd12036a58785aa7098b524ee93beca523 (diff) |
Merge pull request #26 from T-X/for-upstream
try non-fuzzy prior fuzzy mac matching
-rw-r--r-- | nodedb.py | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -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'] |