[tor-commits] [arm/master] fix: cagraph was being imported when running cli

[atagar@xxxxxxxxxxxxxx]

commit 69ffa459a30c0a5b3fb69150b3f593645abb1be8
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Tue Jun 28 10:20:50 2011 -0700

    fix: cagraph was being imported when running cli
    
    The cagraph dependency should only be needed if we're running the gui. However,
    an import for it accidently slipped in, causing import errors for arm's cli
    users.
---
 src/starter.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/starter.py b/src/starter.py
index 104e0e2..005b43f 100644
--- a/src/starter.py
+++ b/src/starter.py
@@ -17,7 +17,6 @@ import platform
 import version
 import cli.controller
 import cli.logPanel
-import gui.controller
 import util.conf
 import util.connections
 import util.hostnames
@@ -436,6 +435,7 @@ if __name__ == '__main__':
     locale.setlocale(locale.LC_ALL, "")
   
   if launchGui == True:
+    import gui.controller
     gui.controller.startGui()
   else:
     cli.controller.startTorMonitor(time.time() - initTime)

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