mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.4.2'

Browse source
This commit is contained in:
teor 2020-01-14 17:41:44 +10:00
commit 8095c785f1
No known key found for this signature in database
GPG key ID: 10FEAA0E7075672A
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
changes/ticket32705_disable Normal file
View file

@ -0,0 +1,7 @@
o Minor bugfixes (testing):
- When TOR_DISABLE_PRACTRACKER is set, do not apply it to the
test_practracker.sh script. Doing so caused a test failure.
Fixes bug 32705; bugfix on 0.4.2.1-alpha.
- When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr
when skipping practracker checks.
Fixes bug 32705; bugfix on 0.4.2.1-alpha.

2
scripts/maint/practracker/practracker.py
View file

@ -300,5 +300,7 @@ variable.
if __name__ == '__main__': if __name__ == '__main__':
if os.environ.get("TOR_DISABLE_PRACTRACKER"): if os.environ.get("TOR_DISABLE_PRACTRACKER"):
print("TOR_DISABLE_PRACTRACKER is set, skipping practracker tests.",
file=sys.stderr)
sys.exit(0) sys.exit(0)
main(sys.argv) main(sys.argv)

1
scripts/maint/practracker/test_practracker.sh
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
umask 077 umask 077
unset TOR_DISABLE_PRACTRACKER
TMPDIR="" TMPDIR=""
clean () { clean () {