diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-08-01 08:40:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-08-01 08:40:56 -0400 |
| commit | 3221dc1b32f651f45184efab6bc3a8fa4863aea4 (patch) | |
| tree | 77c104de35c960e7d80ef6010c936dc05aefafd6 | |
| parent | 8d3f3e5d30fa97479bc218a2896cb538ea220514 (diff) | |
| download | tor-3221dc1b32f651f45184efab6bc3a8fa4863aea4.tar.gz tor-3221dc1b32f651f45184efab6bc3a8fa4863aea4.zip | |
Lower check of TOR_DISABLE_PRACTRACKER
Since we sometimes call practracker directly, that's where we should
check the TOR_DISABLE_PRACTRACKER envvar.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | scripts/maint/practracker/practracker.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index d6ea72c17a..b1e94ae0fc 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 a60b0a8425..245d01d36d 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) |