1 files changed, 32 insertions, 16 deletions
diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py
index 642ae40..46a7991 100644
--- a/src/backend/autoremove.py
+++ b/src/backend/autoremove.py
@@ -2,6 +2,7 @@
 
 import atexit
 import io
+import signal
 import subprocess
 import sys
 import sisyphus.checkenv
@@ -10,25 +11,40 @@ import sisyphus.killemerge
 import sisyphus.syncdb
 
 
-def start():
-    if sisyphus.checkenv.root():
-        p_exe = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask'])
+def sigint_handler(signal, frame):
+    sys.exit(0)
+
+
+signal.signal(signal.SIGINT, sigint_handler)
+
+
+def start(gfx_ui=False):
+    args = ['--quiet', '--depclean']
+
+    if sisyphus.checkenv.root() and not gfx_ui:
+        p_exe = subprocess.Popen(['emerge'] + args + ['--ask'])
+        try:
+            p_exe.wait()
+            sisyphus.syncdb.lcl_tbl()
+        except KeyboardInterrupt:
+            p_exe.terminate()
+            try:
+                p_exe.wait(1)
+            except subprocess.TimeoutExpired:
+                p_exe.kill()
+            sys.exit()
+    elif gfx_ui:
+        p_exe = subprocess.Popen(
+            ['emerge'] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # kill portage if the program dies or it's terminated by the user
+        atexit.register(sisyphus.killemerge.start, p_exe)
+
+        for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"):
+            print(p_out.rstrip())
+
         p_exe.wait()
         sisyphus.syncdb.lcl_tbl()
     else:
         print(sisyphus.getcolor.bright_red +
               "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
         sys.exit()
-
-
-def xstart():
-    p_exe = subprocess.Popen(['emerge', '--depclean'],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    # kill portage if the program dies or it's terminated by the user
-    atexit.register(sisyphus.killemerge.start, p_exe)
-
-    for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"):
-        print(p_out.rstrip())
-
-    p_exe.wait()
-    sisyphus.syncdb.lcl_tbl()