From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Nov 2018 15:59:23 +0000 (-0500)
Subject: Make the topological-sort output off by default
X-Git-Tag: tor-0.4.0.1-alpha~97^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fae29f7b424460353b3a5ab44e1394fdc28cc4c4;p=thirdparty%2Ftor.git

Make the topological-sort output off by default
---

diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py
index ecda3fc565..3afd9bbebe 100755
--- a/scripts/maint/checkIncludes.py
+++ b/scripts/maint/checkIncludes.py
@@ -135,6 +135,7 @@ def load_include_rules(fname):
     return result
 
 list_unused = False
+log_sorted_levels = False
 
 uses_dirs = { }
 
@@ -169,11 +170,12 @@ while uses_dirs:
     for k in cur_level:
         del uses_dirs[k]
     n += 1
-    if cur_level:
+    if cur_level and log_sorted_levels:
         print(n, cur_level)
     if n > 100:
         break
 
 if uses_dirs:
-    print("Circular dependencies in here somewhere:", uses_dirs)
+    print("There are circular .may_include dependencies in here somewhere:",
+          uses_dirs)
     sys.exit(1)