summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/libsisyphus.py16
-rw-r--r--src/backend/plm.patch30
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
+