From 05f1fa8cc99c5d8a2199ef4fa8ae272cc2aac078 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Nov 2018 23:53:58 +0000 Subject: make more room for hybrid and source mode --- src/backend/libsisyphus.py | 8 ++++---- src/frontend/gui/sisyphus-gui.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index 871a84f..b0d07de 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -66,7 +66,7 @@ def getRemoteDscsURL(): return remoteDscsURL @animation.wait('resolving dependencies') -def getPkgDeps(pkgList): +def getPkgBinaryDeps(pkgList): binaryDeps = [] portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgList, stdout=subprocess.PIPE) @@ -77,7 +77,7 @@ def getPkgDeps(pkgList): return binaryDeps @animation.wait('resolving dependencies') -def getWorldDeps(): +def getWorldBinaryDeps(): binaryDeps = [] 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) @@ -200,7 +200,7 @@ def startInstall(pkgList): syncAll() binhostURL = getBinhostURL() - binaryDeps = getPkgDeps(pkgList) + binaryDeps = getPkgBinaryDeps(pkgList) binaryPkgs = [] if not len(binaryDeps) == 0: @@ -242,7 +242,7 @@ def startUpgrade(): syncAll() binhostURL = getBinhostURL() - binaryDeps = getWorldDeps() + binaryDeps = getWorldBinaryDeps() binaryPkgs = [] if not len(binaryDeps) == 0: diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 247594b..29f3ee6 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -366,7 +366,7 @@ class MainWorker(QtCore.QObject): pkgList = Sisyphus.pkgList binhostURL = getBinhostURL() - binaryDeps = getPkgDeps(pkgList) + binaryDeps = getPkgBinaryDeps(pkgList) binaryPkgs = [] os.chdir(portageCache) @@ -427,7 +427,7 @@ class MainWorker(QtCore.QObject): self.started.emit() binhostURL = getBinhostURL() - binaryDeps = getWorldDeps() + binaryDeps = getWorldBinaryDeps() binaryPkgs = [] os.chdir(portageCache) -- cgit v1.2.3