backend : enable bdeps by default in solvedeps && install && ebuildinstall modules so we get everything in one go

5 files changed, 18 insertions, 20 deletions

diff --git a/src/backend/check.py b/src/backend/check.py
index c4b566e..f6ef68d 100644
--- a/src/backend/check.py
+++ b/src/backend/check.py
@@ -62,8 +62,3 @@ def overlay():
 
         gitExec.wait()
         return needsOverlay
-
-def update():
-    portage()
-    overlay()
-    
diff --git a/src/backend/ebuildinstall.py b/src/backend/ebuildinstall.py
index 12bfcad..11253c1 100644
--- a/src/backend/ebuildinstall.py
+++ b/src/backend/ebuildinstall.py
@@ -40,7 +40,7 @@ def start(pkgname):
                             if os.path.exists(binary.rstrip().split("/")[1]):
                                 os.remove(binary.rstrip().split("/")[1])
 
-                        portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE)
+                        portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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():
@@ -73,7 +73,7 @@ def start(pkgname):
                             if os.path.exists(binary.rstrip().split("/")[1]):
                                 os.remove(binary.rstrip().split("/")[1])
 
-                        portageExec = subprocess.Popen(['emerge', '--usepkg', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE)
+                        portageExec = subprocess.Popen(['emerge', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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():
@@ -87,7 +87,7 @@ def start(pkgname):
                 else:
                     print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + "  ".join(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', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE)
+                        portageExec = subprocess.Popen(['emerge', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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():
@@ -99,7 +99,7 @@ def start(pkgname):
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
         else:
-            portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE)
+            portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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():
diff --git a/src/backend/install.py b/src/backend/install.py
index 4fcc675..f6aeb67 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -42,7 +42,7 @@ def start(pkgname):
                             if os.path.exists(binary.rstrip().split("/")[1]):
                                 os.remove(binary.rstrip().split("/")[1])
 
-                        portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE)
+                        portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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():
@@ -83,7 +83,7 @@ def startqt(pkgname):
         if os.path.exists(binary.rstrip().split("/")[1]):
             os.remove(binary.rstrip().split("/")[1])
 
-    portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE)
+    portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killportage.start, portageExec)
 
diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py
index d04ebc0..85d245a 100644
--- a/src/backend/solvedeps.py
+++ b/src/backend/solvedeps.py
@@ -9,7 +9,7 @@ def package(pkgname):
     areBinaries = []
     areSources = []
     needsConfig = int()
-    portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     for portageOutput in io.TextIOWrapper(portageExec.stderr, encoding="utf-8"):
         if "The following keyword changes are necessary to proceed:" in portageOutput.rstrip():
diff --git a/src/backend/update.py b/src/backend/update.py
index efb8dfc..df6dc5d 100644
--- a/src/backend/update.py
+++ b/src/backend/update.py
@@ -10,14 +10,17 @@ import sisyphus.database
 import sisyphus.metadata
 import sisyphus.sync
 
-def dosync():
+def syncAll():
     sisyphus.sync.portage()
     sisyphus.sync.overlay()
     sisyphus.sync.portageCfg()
     sisyphus.database.syncRemote()
     sisyphus.metadata.regenSilent()
 
-def checksync():
+def syncCfg():
+    sisyphus.sync.portageCfg()
+
+def doSync():
     sisyphus.cache.clean()
 
     needsPortage = sisyphus.check.portage()
@@ -25,14 +28,14 @@ def checksync():
 
     if needsPortage == 1:
         if needsOverlay == 1:
-            dosync()
+            syncAll()
         elif not needsOverlay == 1:
-            dosync()
+            syncAll()
     elif not needsPortage == 1:
         if needsOverlay == 1:
-            dosync()
+            syncAll()
         elif not needsOverlay == 1:
-            sisyphus.sync.portageCfg()
+            syncCfg()
 
 @animation.wait('fetching updates')
 def start():
@@ -40,7 +43,7 @@ def start():
     needsMatch,localBranch = sisyphus.check.match()
 
     if needsMatch == 0:
-        checksync()
+        doSync()
     else:
         if "packages-next" in isBinhost:
             print("\nCurrent branch: '" + localBranch.decode().strip()  + "' (stable)" + "\nCurrent binhost: '" + isBinhost + "' (testing)")
@@ -53,7 +56,7 @@ def startqt():
     needsMatch,localBranch = sisyphus.check.match()
 
     if needsMatch == 0:
-        checksync()
+        doSync()
     else:
         if "packages-next" in isBinhost:
             print("\nCurrent branch: '" + localBranch.decode().strip()  + "' (stable)" + "\nCurrent binhost: '" + isBinhost + "' (testing)")