commit 3d5751d080f0f5e897af64a320eaba5d62b0c002 Author: George Kadianakis <desnacked@riseup.net> Date: Wed Nov 25 14:49:51 2020 +0200 Fix Chutney after recent Tor changes. Tor commits 1588767e and 4382e977 broke Chutney and we fix them here. See https://gitlab.torproject.org/tpo/core/tor/-/issues/40204 . --- lib/chutney/TorNet.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index fa6f6aa..c80bfda 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -344,6 +344,9 @@ def get_tor_version(tor): "--version", ] tor_version = run_tor(cmdline) + # Keep only the first line of the output: since #32102 a bunch of more + # lines have been added to --version and we only care about the first + tor_version = tor_version.split("\n")[0] # clean it up a bit tor_version = tor_version.strip() tor_version = tor_version.replace("version ", "") @@ -767,9 +770,9 @@ class LocalNodeBuilder(NodeBuilder): tor, "--ignore-missing-torrc", "-f", torrc, - "--list-fingerprint", "--orport", "1", "--datadirectory", datadir, + "--list-fingerprint", ] stdouterr = run_tor(cmdline) fingerprint = "".join((stdouterr.rstrip().split('\n')[-1]).split()[1:])