[or-cvs] [torflow/master 32/92] return instead of sys.exit from main()

[mikeperry@xxxxxxxxxxxxxx]

Author: John M. Schanck <john@xxxxxxxxxxx>
Date: Fri, 23 Jul 2010 01:52:42 -0400
Subject: return instead of sys.exit from main()
Commit: eb3f9f14892bef32295a9f8230f1b4678fe87514

---
 NetworkScanners/ExitAuthority/soat.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index 6dc3f68..a82bb00 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -2929,7 +2929,7 @@ def main(argv):
     dirsok &= datahandler.checkResultDir(d)
   if not dirsok:
     plog("ERROR", "Could not create result directories")
-    sys.exit(1)
+    return
 
   # Initialize tests
   #XXX: Resume currently broken. New depickling routines required
@@ -2964,11 +2964,10 @@ def main(argv):
     if do_html:
       tests["HTML"] = SearchBasedHTMLTest(html_wordlist_file)
 
-
   # maybe no tests could be initialized
   if not tests:
     plog('INFO', 'Done.')
-    sys.exit(0)
+    return
 
   # Make sure refetch_ip is valid rather than exploding mid-test
   global refetch_ip
@@ -3078,7 +3077,7 @@ def main(argv):
         all_finished = False
     if all_finished:
       plog("NOTICE", "All tests have finished. Exiting\n")
-      sys.exit(0)
+      return
 
 # initiate the program
 #
-- 
1.7.1