[tor-commits] [tor/master] Lower check of TOR_DISABLE_PRACTRACKER

[dgoulet at torproject.org]

commit 3221dc1b32f651f45184efab6bc3a8fa4863aea4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 1 08:40:56 2019 -0400

    Lower check of TOR_DISABLE_PRACTRACKER
    
    Since we sometimes call practracker directly, that's where we should
    check the TOR_DISABLE_PRACTRACKER envvar.
---
 Makefile.am                              | 4 +---
 scripts/maint/practracker/practracker.py | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d6ea72c17..b1e94ae0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -369,9 +369,7 @@ endif
 
 check-best-practices:
 if USEPYTHON
-	@if test "$$TOR_DISABLE_PRACTRACKER" = ""; then \
-		$(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py $(top_srcdir); \
-	fi
+	@$(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py $(top_srcdir)
 endif
 
 practracker-regen:
diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py
index a60b0a842..245d01d36 100755
--- a/scripts/maint/practracker/practracker.py
+++ b/scripts/maint/practracker/practracker.py
@@ -246,4 +246,6 @@ variable.
     sys.exit(found_new_issues)
 
 if __name__ == '__main__':
+    if os.environ.get("TOR_DISABLE_PRACTRACKER"):
+        sys.exit(0)
     main(sys.argv)