[tor-commits] [tor/master] In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'

[nickm at torproject.org]

commit 7fbe7a256383eebae35c8eec31fe88807c82d394
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Mon Jan 7 11:09:33 2019 +0200

    In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'
---
 changes/bug24953                    |  4 ++++
 scripts/maint/updateFallbackDirs.py | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/changes/bug24953 b/changes/bug24953
new file mode 100644
index 000000000..d142dfd6c
--- /dev/null
+++ b/changes/bug24953
@@ -0,0 +1,4 @@
+  o Minor bugfixes (fallback scripts):
+    - In updateFallbackDirs.py, call the filter file a "fallback list"
+      instead of a "whitelist" in check_existing mode.
+      Fixes bug 24953; bugfix on 0.3.0.3-alpha.
diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py
index 14372d0e8..e93db7ab3 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -1594,7 +1594,7 @@ class CandidateList(dict):
     """ Apply the fallback whitelist_obj to this fallback list,
         passing exact to is_in_whitelist(). """
     excluded_count = 0
-    logging.debug('Applying whitelist')
+    logging.debug('Applying fallback list')
     # parse the whitelist
     whitelist = self.load_relaylist(whitelist_obj)
     filtered_fallbacks = []
@@ -1609,14 +1609,18 @@ class CandidateList(dict):
       else:
           # exclude
           excluded_count += 1
-          log_excluded('Excluding %s: not in whitelist.',
+          log_excluded('Excluding %s: not in fallback list.',
                        f._fpr)
     self.fallbacks = filtered_fallbacks
     return excluded_count
 
   @staticmethod
-  def summarise_filters(initial_count, excluded_count):
-    return '/* Whitelist excluded %d of %d candidates. */'%(
+  def summarise_filters(initial_count, excluded_count, check_existing):
+    list_type = 'Whitelist'
+    if check_existing:
+        list_type = 'Fallback list'
+
+    return '/* %s excluded %d of %d candidates. */'%(list_type,
                                                 excluded_count, initial_count)
 
   # calculate each fallback's measured bandwidth based on the median
@@ -2284,7 +2288,8 @@ def list_fallbacks(whitelist, exact=False):
   # instead, there will be an info-level log during the eligibility check.
   initial_count = len(candidates.fallbacks)
   excluded_count = candidates.apply_filter_lists(whitelist, exact=exact)
-  print candidates.summarise_filters(initial_count, excluded_count)
+  print candidates.summarise_filters(initial_count, excluded_count,
+          whitelist['check_existing'])
   eligible_count = len(candidates.fallbacks)
 
   # calculate the measured bandwidth of each relay,