[tor-commits] [chutney/master] Put the --quiet option last on the tor command line

[teor@xxxxxxxxxxxxxx]

commit 55450d524fb85a9f945d3cc8258bb7d09637ae71
Author: teor <teor2345@xxxxxxxxx>
Date:   Thu Oct 26 14:23:11 2017 +1100

    Put the --quiet option last on the tor command line
    
    This makes it easier to find out what went wrong when tor fails to launch.
    
    Implements 24003.
---
 lib/chutney/TorNet.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index d48f383..3e6da22 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -436,12 +436,13 @@ class LocalNodeBuilder(NodeBuilder):
         torrc = self._getTorrcFname()
         cmdline = [
             tor,
-            "--quiet",
             "--ignore-missing-torrc",
             "-f", torrc,
             "--list-fingerprint",
             "--orport", "1",
-            "--datadirectory", datadir]
+            "--datadirectory", datadir,
+            "--quiet",
+            ]
         try:
             p = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
         except OSError as e:
@@ -612,9 +613,9 @@ class LocalNodeController(NodeController):
         torrc = self._getTorrcFname()
         cmdline = [
             tor_path,
-            "--quiet",
             "-f", torrc,
-        ]
+            "--quiet",
+            ]
         try:
             p = subprocess.Popen(cmdline)
         except OSError as e:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits