diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-22 10:51:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-22 10:51:33 +0100 |
| commit | a369b55db38f9a3f295686f9c6363c894bb49a48 (patch) | |
| tree | 707c137af527a2f099e19803ebe6364846b0eb49 | |
| parent | fde8531a7597b443a5315cfa614f4a6991f1027b (diff) | |
libsisyphus.py : fix breakage introduced in 8dc2ab082f49b4bfaa9a4de05fe97bbddaf1eecf
| -rw-r--r-- | src/backend/libsisyphus.py | 16 | ||||
| -rw-r--r-- | src/backend/plm.patch | 30 |
2 files changed, 44 insertions, 2 deletions
diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index 6e238f8..8719f82 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -87,7 +87,13 @@ def getPkgDeps(pkgList): for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): if "/" in portageOutput.rstrip(): pkgDep = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) - if not "blocks" and not "uninstall" in pkgDep: + if "blocks" in pkgDep: + pass + elif "blocking" in pkgDep: + pass + elif "uninstall" in pkgDep: + pass + else: pkgDeps.append(pkgDep) return pkgDeps @@ -99,7 +105,13 @@ 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 "blocks" and not "uninstall" in worldDep: + if "blocks" in worldDep: + pass + elif "blocking" in worldDep: + pass + elif "uninstall" in worldDep: + pass + else: worldDeps.append(worldDep) return worldDeps diff --git a/src/backend/plm.patch b/src/backend/plm.patch new file mode 100644 index 0000000..2e203bd --- /dev/null +++ b/src/backend/plm.patch @@ -0,0 +1,30 @@ +diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py +index 9512621..b0c7f8e 100644 +--- a/src/backend/libsisyphus.py ++++ b/src/backend/libsisyphus.py +@@ -87,7 +87,11 @@ def getPkgDeps(pkgList): + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + if "/" in portageOutput.rstrip(): + pkgDep = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) +- if not "blocks" and not "uninstall" in pkgDep: ++ if "blocks" in pkgDep: ++ pass ++ elif "uninstall" in pkgDep: ++ pass ++ else: + pkgDeps.append(pkgDep) + return pkgDeps + +@@ -99,7 +103,11 @@ 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 "blocks" and not "uninstall" in worldDep: ++ if "blocks" in worldDep: ++ pass ++ elif "uninstall" in worldDep: ++ pass ++ else: + worldDeps.append(worldDep) + return worldDeps + |