From 8dc2ab082f49b4bfaa9a4de05fe97bbddaf1eecf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Sep 2018 23:26:38 +0100 Subject: libsisyphus.py : * expand the install parser to cover some more cases and avoid "Exception: 404: Not Found" errors * filter out some more portage resolution messages to further avoid dependency list mixups --- src/backend/libsisyphus.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index c218972..09959e9 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -86,8 +86,8 @@ def getPkgDeps(pkgList): for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): if "/" in portageOutput.rstrip(): - pkgDep = str(portageOutput.rstrip().split("]")[1].strip("\ ")) - if not "blocking" in pkgDep: + pkgDep = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) + if not "blocks" and not "uninstall" in pkgDep: pkgDeps.append(pkgDep) return pkgDeps @@ -99,7 +99,7 @@ def getWorldDeps(): for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): if "/" in portageOutput.rstrip(): worldDep = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) - if not "blocking" in worldDep: + if not "blocks" and not "uninstall" in worldDep: worldDeps.append(worldDep) return worldDeps -- cgit v1.2.3