From 42df0bc391b29cd42dff591c7e6cbe08558ae29c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 23:05:05 +0000 Subject: cover some more portage errors --- src/backend/libsisyphus.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index 0de7f95..a01c137 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -76,6 +76,12 @@ def getPackageDeps(pkgList): if "The following mask changes are necessary to proceed:" in portageOutput.rstrip(): needsConfig = int(1) + if "The following USE changes are necessary to proceed:" in portageOutput.rstrip(): + needsConfig = int(1) + + if "The following REQUIRED_USE flag constraints are unsatisfied:" in portageOutput.rstrip(): + needsConfig = int(1) + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): if "binary" in portageOutput.rstrip(): isBinary = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) @@ -100,6 +106,12 @@ def getWorldDeps(): if "The following mask changes are necessary to proceed:" in portageOutput.rstrip(): needsConfig = int(1) + if "The following USE changes are necessary to proceed:" in portageOutput.rstrip(): + needsConfig = int(1) + + if "The following REQUIRED_USE flag constraints are unsatisfied:" in portageOutput.rstrip(): + needsConfig = int(1) + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): if "binary" in portageOutput.rstrip(): isBinary = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) -- cgit v1.2.3