[tor-commits] [arm/release] fix: dropping os check for startup wizard option

[atagar@xxxxxxxxxxxxxx]

commit 7a187c482f306fbfbe83552cc2a618e393e357e3
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Sat Sep 24 14:43:35 2011 -0700

    fix: dropping os check for startup wizard option
    
    The startup wizard option is currently unimplemented and disabled in the
    setting.cfg. However, there was an os compatability check left over from when I
    was gonna implement it. That and its comment were confusing since the option's
    not implemented so commenting it out with a more up to date expanation.
---
 src/cli/wizard.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/cli/wizard.py b/src/cli/wizard.py
index da4e645..86522d1 100644
--- a/src/cli/wizard.py
+++ b/src/cli/wizard.py
@@ -331,10 +331,15 @@ def showWizard():
   if not os.path.exists(os.path.dirname(SYSTEM_DROP_PATH)) or not os.path.exists(OVERRIDE_SCRIPT):
     disabledOpt.append(Options.SYSTEM)
   
+  # TODO: The STARTUP option is currently disabled in the 'settings.cfg', and I
+  # don't currently have plans to implement it (it would be a big pita, and the
+  # tor deb already handles it). *If* it is implemented then I'd limit support
+  # for the option to Debian and Ubuntu to start with, via the following...
+  
   # Running at startup is currently only supported for Debian and Ubuntu.
   # Patches welcome for supporting other platforms.
-  if not platform.dist()[0] in ("debian", "Ubuntu"):
-    disabledOpt.append(Options.STARTUP)
+  #if not platform.dist()[0] in ("debian", "Ubuntu"):
+  #  disabledOpt.append(Options.STARTUP)
   
   while True:
     if relayType == None:



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