1 files changed, 1 insertions, 62 deletions
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index d2961d6..19bbd17 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -58,65 +58,4 @@ def start():
             else:
                 sys.exit("\n" + "No package upgrades found; Quitting." + "\n")
         else:
-            if not len(areBinaries) == 0:
-                os.chdir(sisyphus.filesystem.portageCacheDir)
-                print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + str(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
-                print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + str(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
-                if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
-                    for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                        print(">>> Fetching" + " " + binhostURL + binary)
-                        wget.download(binhostURL + binary)
-                        print("\n")
-
-                        subprocess.call(['qtbz2', '-x'] + binary.rstrip().split("/")[1].split())
-                        CATEGORY = subprocess.check_output(['qxpak', '-x', '-O'] + binary.rstrip().split("/")[1].replace('tbz2', 'xpak').split() + ['CATEGORY'])
-
-                        if os.path.exists(binary.rstrip().split("/")[1].replace('tbz2', 'xpak')):
-                            os.remove(binary.rstrip().split("/")[1].replace('tbz2', 'xpak'))
-
-                        if os.path.isdir(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip())):
-                            shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip()), os.path.basename(binary.rstrip().split("/")[1])))
-                        else:
-                            os.makedirs(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip()))
-                            shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip()), os.path.basename(binary.rstrip().split("/")[1])))
-
-                        if os.path.exists(binary.rstrip().split("/")[1]):
-                            os.remove(binary.rstrip().split("/")[1])
-
-                    portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE)
-
-                    for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
-                        if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
-                            if not "Calculating dependencies" in portageOutput.rstrip():
-                                print(portageOutput.rstrip())
-
-                    portageExec.wait()
-                    sisyphus.database.syncLocal()
-                else:
-                    sys.exit("\n" + "Ok; Quitting." + "\n")
-            else:
-                print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + str(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
-                if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
-                    portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE)
-
-                    for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
-                        if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
-                            if not "Calculating dependencies" in portageOutput.rstrip():
-                                print(portageOutput.rstrip())
-
-                    portageExec.wait()
-                    sisyphus.database.syncLocal()
-                else:
-                    sys.exit("\n" + "Ok; Quitting." + "\n")
-    else:
-        portageExec = subprocess.Popen(['emerge', '--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE)
-
-        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
-            if not "Local copy of remote index is up-to-date and will be used." in portageOutput.rstrip():
-                if not "ebuild" in portageOutput.rstrip():
-                    if not "binary" in portageOutput.rstrip():
-                        print(portageOutput.rstrip())
-
-        portageExec.wait()
-        sys.exit("\n" + "Cannot proceed; Apply the above changes to your portage configuration files and try again; Quitting." + "\n")
-
+            sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus upgrade --hybrid" + "'" + ";" + " " + "Quitting." + "\n")