From 0ce66b4deb653d31ac71a1a5020a12d7fed12f48 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Aug 2018 07:12:51 +0100 Subject: do not allow portage's messages to jumble dependency list --- src/backend/libsisyphus.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index e8a4649..55e185a 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -240,7 +240,8 @@ def solvePkgDeps(pkgList): for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): if "/" in portageOutput.rstrip(): pkgDep = str(portageOutput.rstrip().split("]")[1].strip("\ ")) - pkgDeps.append(pkgDep) + if not "blocking" in pkgDep: + pkgDeps.append(pkgDep) return pkgDeps # call portage to solve world dependencies (CLI frontend) @@ -255,7 +256,8 @@ def solveWorldDeps(): if "/" in portageOutput.rstrip(): worldDep = str(portageOutput.rstrip().split("]")[ 1].split("[")[0].strip("\ ")) - worldDeps.append(worldDep) + if not "blocking" in worldDep: + worldDeps.append(worldDep) return worldDeps # fetch binaries and call portage to install the package(s) from local cache (CLI frontend) -- cgit v1.2.3