From ae66c3f1ce2935ef860f043e19591f7b8c2c8ead Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 20 Oct 2015 02:14:05 +0000 Subject: [PATCH] Revert "mirrorlist: Use a thread-local copy of the tree to prevent changing the global one" This reverts commit 738e67c90c6abfdf5030f894c7ef8950ee42c8ae. --- files/hotfix/mirrorlist/mirrorlist_server.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/files/hotfix/mirrorlist/mirrorlist_server.py b/files/hotfix/mirrorlist/mirrorlist_server.py index b8842295ac..39dfc7a786 100755 --- a/files/hotfix/mirrorlist/mirrorlist_server.py +++ b/files/hotfix/mirrorlist/mirrorlist_server.py @@ -6,7 +6,6 @@ # standard library modules in alphabetical order from collections import defaultdict -import copy import datetime import getopt import logging @@ -235,12 +234,11 @@ def tree_lookup(tree, ip, field, maxResults=None): # and we'll get a new copy of the tree from our parent the next time it # fork()s. # returns a list of tuples (prefix, data) - ltree = copy.deepcopy(tree) result = [] len_data = 0 if ip is None: return result - node = ltree.search_best(ip.strNormal()) + node = tree.search_best(ip.strNormal()) while node is not None: prefix = node.prefix if type(node.data[field]) == list: @@ -250,8 +248,8 @@ def tree_lookup(tree, ip, field, maxResults=None): t = (prefix, node.data[field],) result.append(t) if maxResults is None or len_data < maxResults: - ltree.delete(prefix) - node = ltree.search_best(ip.strNormal()) + tree.delete(prefix) + node = tree.search_best(ip.strNormal()) else: break return result