Entropy/Reagent:

- use SystemExit instead of sys.exit()
Entropy/Activator:
- use SystemExit instead of sys.exit()


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2855 cd1c1023-2f26-0410-ae45-c471fc1f0318

server/activator.py

@@ -79,20 +79,20 @@ options = sys.argv[1:]
 # print version
 if (' '.join(options).find("--version") != -1) or (' '.join(options).find(" -V") != -1):
     print_generic("activator: "+etpConst['entropyversion'])
-    sys.exit(0)
+    raise SystemExit(0)
 
 # print help
 if len(options) < 1 or ' '.join(options).find("--help") != -1 or ' '.join(options).find(" -h") != -1:
     print_menu(myopts)
     if len(options) < 1:
-	print_error("not enough parameters")
-    sys.exit(1)
+        print_error("not enough parameters")
+    raise SystemExit(1)
 
 # preliminary options parsing
 _options = []
 for opt in options:
     if (opt == "--nocolor"):
-	nocolor()
+        nocolor()
     else:
         if (opt == "--quiet"):
             etpUi['quiet'] = True
@@ -108,25 +108,27 @@ options = _options
 
 if not entropyTools.isRoot():
     print_error("you must be root in order to run activator")
-    sys.exit(2)
+    raise SystemExit(2)
 elif (options[0] == "sync"):
     import server_activator
     server_activator.sync(options[1:])
-    raise SystemExit
+    raise SystemExit(0)
 elif (options[0] == "tidy"):
     import server_activator
     server_activator.sync(options[1:], justTidy = True)
-    raise SystemExit
+    raise SystemExit(0)
 elif (options[0] == "database"):
     import server_activator
     server_activator.database(options[1:])
-    raise SystemExit
+    raise SystemExit(0)
 elif (options[0] == "packages"):
     import server_activator
     server_activator.packages(options[1:])
-    raise SystemExit
+    raise SystemExit(0)
 # database tool
 elif (options[0] == "notice"):
     import server_activator
     server_activator.notice(options[1:])
-    raise SystemExit
+    raise SystemExit(0)
+
+raise SystemExit(1)

server/reagent.py

@@ -107,14 +107,14 @@ options = sys.argv[1:]
 # print version
 if (' '.join(options).find("--version") != -1) or (' '.join(options).find(" -V") != -1):
     print_generic("reagent: "+etpConst['entropyversion'])
-    sys.exit(0)
+    raise SystemExit(0)
 
 # print help
 if len(options) < 1 or ' '.join(options).find("--help") != -1 or ' '.join(options).find(" -h") != -1:
     print_menu(myopts)
     if len(options) < 1:
 	print_error("not enough parameters")
-    sys.exit(1)
+    raise SystemExit(1)
 
 # preliminary options parsing
 _options = []
@@ -141,58 +141,60 @@ elif (options[0] == "update"):
     import server_reagent
     rc = server_reagent.update(options[1:])
     server_reagent.Entropy.close_server_databases()
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 elif (options[0] == "inject"):
     import server_reagent
     rc = server_reagent.inject(options[1:])
     server_reagent.Entropy.close_server_databases()
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 # database tool
 elif (options[0] == "database"):
     import server_reagent
     server_reagent.database(options[1:])
     server_reagent.Entropy.close_server_databases()
-    sys.exit(0)
+    raise SystemExit(0)
 
 elif (options[0] == "query"):
     import server_query
     rc = server_query.query(options[1:])
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 elif (options[0] == "repo"):
     import server_reagent
     rc = server_reagent.repositories(options[1:])
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 elif (options[0] == "deptest"):
     import server_reagent
     server_reagent.Entropy.dependencies_test()
     server_reagent.Entropy.close_server_databases()
-    sys.exit(0)
+    raise SystemExit(0)
 
 elif (options[0] == "libtest"):
     import server_reagent
     rc = server_reagent.Entropy.libraries_test()
     x = server_reagent.Entropy.close_server_databases()
-    sys.exit(0)
+    raise SystemExit(0)
 
 # deptest tool
 elif (options[0] == "depends"):
     import server_reagent
     rc = server_reagent.Entropy.depends_table_initialize()
     server_reagent.Entropy.close_server_databases()
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 # cleanup
 elif (options[0] == "cleanup"):
     rc = entropyTools.cleanup()
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 # deptest tool
 elif (options[0] == "spm"):
     import server_reagent
     rc = server_reagent.spm(options[1:])
     server_reagent.Entropy.close_server_databases()
-    sys.exit(rc)
+    raise SystemExit(rc)
+
+raise SystemExit(1)

server/server_reagent.py

@@ -50,7 +50,8 @@ def repositories(options):
 
     repoid = None
     repoid_dest = None
-    cmd = options[0]
+    if not options: cmd = ""
+    else: cmd = options[0]
     myopts = []
     for opt in options[1:]:
         if cmd in ["enable","disable"]: