Revert "make some noise"

This reverts commit 49a117d75b6bf8a3437f8fe8ef0770b177c034d8.

4 files changed, 27 insertions, 18 deletions

diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py
index 05ecabc..8dc00ec 100644
--- a/src/backend/autoremove.py
+++ b/src/backend/autoremove.py
@@ -13,7 +13,7 @@ import sisyphus.syncdb
 def start():
     if sisyphus.checkenv.root():
         portageExec = subprocess.Popen(
-            ['emerge', '--depclean', '--ask'])
+            ['emerge', '--quiet', '--depclean', '--ask'])
         portageExec.wait()
         sisyphus.syncdb.localTable()
     else:
diff --git a/src/backend/install.py b/src/backend/install.py
index d0821f5..fdca205 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -34,8 +34,8 @@ def start(pkgname):
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.download.pkgbinpkgonly()
-                            portageExec = subprocess.Popen(['emerge', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
-                                                           '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
+                            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly',
+                                                           '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
                             break
@@ -89,8 +89,8 @@ def estart(pkgname):
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.download.pkgbinpkgonly()
-                            portageExec = subprocess.Popen(['emerge', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
-                                                           '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
+                            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly',
+                                                            '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
                             break
@@ -119,7 +119,7 @@ def estart(pkgname):
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.download.pkgbinpkg()
-                            portageExec = subprocess.Popen(['emerge', '--verbose', '--usepkg', '--rebuilt-binaries',
+                            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries',
                                                            '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
@@ -141,7 +141,7 @@ def estart(pkgname):
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
                             portageExec = subprocess.Popen(
-                                ['emerge', '--verbose', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
+                                ['emerge', '--quiet', '--verbose', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
                             break
@@ -178,8 +178,8 @@ def xstart(pkgname):
     print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join(
         areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n")
     sisyphus.download.xpkgbinpkgonly()
-    portageExec = subprocess.Popen(['emerge', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y',
-                                   '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
+                                   '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killemerge.start, portageExec)
 
diff --git a/src/backend/uninstall.py b/src/backend/uninstall.py
index 28e746e..77fa479 100644
--- a/src/backend/uninstall.py
+++ b/src/backend/uninstall.py
@@ -13,7 +13,7 @@ import sisyphus.syncdb
 def start(pkgname):
     if sisyphus.checkenv.root():
         portageExec = subprocess.Popen(
-            ['emerge', '--depclean', '--ask'] + list(pkgname))
+            ['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname))
         portageExec.wait()
         sisyphus.syncdb.localTable()
     else:
@@ -25,7 +25,7 @@ def start(pkgname):
 def fstart(pkgname):
     if sisyphus.checkenv.root():
         portageExec = subprocess.Popen(
-            ['emerge', '--unmerge', '--ask'] + list(pkgname))
+            ['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname))
         portageExec.wait()
         sisyphus.syncdb.localTable()
     else:
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index 20a0921..08b7da9 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -34,7 +34,7 @@ def start():
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No " + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.download.worldbinpkgonly()
-                            portageExec = subprocess.Popen(['emerge', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
+                            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
                                                            '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
@@ -89,7 +89,7 @@ def estart():
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.download.worldbinpkgonly()
-                            portageExec = subprocess.Popen(['emerge', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
+                            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
                                                            '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
@@ -119,8 +119,8 @@ def estart():
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.download.worldbinpkg()
-                            portageExec = subprocess.Popen(['emerge', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--rebuilt-binaries',
-                                                           '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
+                            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg',
+                                                           '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
                             break
@@ -140,8 +140,8 @@ def estart():
                         user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
-                            portageExec = subprocess.Popen(['emerge', '--verbose', '--update', '--deep', '--newuse', '--backtrack=100', '--with-bdeps=y',
-                                                           '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--backtrack=100',
+                                                           '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                             portageExec.wait()
                             sisyphus.syncdb.localTable()
                             break
@@ -183,7 +183,16 @@ def xstart():
             print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join(
                 areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n")
             sisyphus.download.xworldbinpkgonly()
-            portageExec = subprocess.Popen(['emerge', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
+            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries',
+                                           '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            # kill portage if the program dies or it's terminated by the user
+            atexit.register(sisyphus.killemerge.start, portageExec)
+
+            for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                print(portageOutput.rstrip())
+
+            portageExec.wait()
+            portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
                                            '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             # kill portage if the program dies or it's terminated by the user
             atexit.register(sisyphus.killemerge.start, portageExec)