[tor-commits] [stem/master] Dropping '--' from config options being used to launch tor

atagar at torproject.org atagar at torproject.org
Sun Dec 9 20:34:33 UTC 2012


commit 4cacd2f13d1cd003db0c15addcf265fa4262ee37
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Dec 9 12:33:06 2012 -0800

    Dropping '--' from config options being used to launch tor
    
    The '--' prefix in '--[config option]' commands are unnecessary. Thanks to
    lunar on #7666 for pointing this out.
---
 stem/process.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stem/process.py b/stem/process.py
index 6696821..aaa36ac 100644
--- a/stem/process.py
+++ b/stem/process.py
@@ -80,7 +80,7 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce
       runtime_args += ["-f", torrc_path]
   
   if take_ownership:
-    runtime_args += ["--__OwningControllerProcess", _get_pid()]
+    runtime_args += ["__OwningControllerProcess", _get_pid()]
   
   tor_process = subprocess.Popen(runtime_args, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
   
@@ -197,7 +197,7 @@ def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, in
             torrc_file.write("%s %s\n" % (key, value))
     
     # prevents tor from erroring out due to a missing torrc if it gets a sighup
-    args = ['--__ReloadTorrcOnSIGHUP', '0']
+    args = ['__ReloadTorrcOnSIGHUP', '0']
     
     return launch_tor(tor_cmd, args, torrc_path, completion_percent, init_msg_handler, timeout, take_ownership)
   finally:



More information about the tor-commits mailing list