From d8db68d9c7773e72da45ed8b45ea6866dea32b09 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Oct 2018 23:56:09 +0100 Subject: and yet another dependency filter fix --- src/backend/libsisyphus.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index 10183c6..c7c951e 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -71,16 +71,9 @@ def getPkgDeps(pkgList): portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgList, stdout=subprocess.PIPE) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - if "/" in portageOutput.rstrip(): + if "binary" in portageOutput.rstrip(): pkgDep = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) - if "blocks" in pkgDep: - pass - elif "blocking" in pkgDep: - pass - elif "uninstall" in pkgDep: - pass - else: - pkgDeps.append(pkgDep) + pkgDeps.append(pkgDep) return pkgDeps @animation.wait('resolving dependencies') @@ -89,16 +82,9 @@ def getWorldDeps(): 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 "/" in portageOutput.rstrip(): + if "binary" in portageOutput.rstrip(): worldDep = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) - if "blocks" in worldDep: - pass - elif "blocking" in worldDep: - pass - elif "uninstall" in worldDep: - pass - else: - worldDeps.append(worldDep) + worldDeps.append(worldDep) return worldDeps def fetchRemoteDatabase(): -- cgit v1.2.3