[tor-commits] [arm/release] fix: detecting for /var/lib/tor-arm

[atagar at torproject.org]

commit 4f88292730be74ede753b2bdc9c1fdcbb9437106
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Aug 6 16:14:07 2011 -0700

    fix: detecting for /var/lib/tor-arm
    
    The '/var/lib/tor-arm' directory lack read permissions for the user we're
    running as, so checking for '/var/lib/tor-arm/torrc' always fails. This is
    just meant to determine if we're run the 'override.py --init' prep so detecting
    for the directory is fine.
---
 src/cli/wizard.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/cli/wizard.py b/src/cli/wizard.py
index 6d9d488..ff4e5cf 100644
--- a/src/cli/wizard.py
+++ b/src/cli/wizard.py
@@ -320,7 +320,7 @@ def showWizard():
   # permissions then we aren't able to deal with the system wide tor instance.
   # Also drop the optoin if we aren't installed since override.py won't be at
   # the expected path.
-  if not os.path.exists(SYSTEM_DROP_PATH) or not os.path.exists(OVERRIDE_SCRIPT):
+  if not os.path.exists(os.path.dirname(SYSTEM_DROP_PATH)) or not os.path.exists(OVERRIDE_SCRIPT):
     disabledOpt.append(Options.SYSTEM)
   
   while True: