aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bersenev <bay@hackerdom.ru>2011-11-11 23:32:19 +0000
committerAlexander Bersenev <bay@hackerdom.ru>2011-11-11 23:32:19 +0000
commitb7bc5d864a43a8874e7a6984a1537d3ded65e2c0 (patch)
treea7fed5f0798ba2442232459977ce437b54c9b931
parentebuild: drop keywords from - 9999 (diff)
downloadautodep-b7bc5d864a43a8874e7a6984a1537d3ded65e2c0.tar.gz
autodep-b7bc5d864a43a8874e7a6984a1537d3ded65e2c0.tar.bz2
autodep-b7bc5d864a43a8874e7a6984a1537d3ded65e2c0.zip
pdepend handling
-rw-r--r--portage_with_autodep/pym/_emerge/EventsAnalyser.py4
-rw-r--r--src/autodep/package_utils/portage_misc_functions.py6
2 files changed, 6 insertions, 4 deletions
diff --git a/portage_with_autodep/pym/_emerge/EventsAnalyser.py b/portage_with_autodep/pym/_emerge/EventsAnalyser.py
index 0f2d2dd..7e416e7 100644
--- a/portage_with_autodep/pym/_emerge/EventsAnalyser.py
+++ b/portage_with_autodep/pym/_emerge/EventsAnalyser.py
@@ -168,9 +168,9 @@ class PortageUtils:
buildtime_deps=self.get_dep(pkg, ["DEPEND"],"portdb")
runtime_deps=set()
for dep in buildtime_deps:
- runtime_deps=runtime_deps.union(self.get_deps(dep,["RDEPEND"],"vardb"))
+ runtime_deps|=self.get_deps(dep,["RDEPEND","PDEPEND"],"vardb")
- ret=buildtime_deps.union(runtime_deps)
+ ret = buildtime_deps | runtime_deps
return ret
diff --git a/src/autodep/package_utils/portage_misc_functions.py b/src/autodep/package_utils/portage_misc_functions.py
index 849c9c8..881ff54 100644
--- a/src/autodep/package_utils/portage_misc_functions.py
+++ b/src/autodep/package_utils/portage_misc_functions.py
@@ -275,9 +275,11 @@ class portage_api:
buildtime_deps=self.get_dep(pkg, ["DEPEND"],"portdb")
runtime_deps=set()
for dep in buildtime_deps:
- runtime_deps=runtime_deps.union(self.get_deps(dep,["RDEPEND"],"vardb"))
+ runtime_deps|=self.get_deps(dep,["RDEPEND","PDEPEND"],"vardb")
- ret=buildtime_deps.union(runtime_deps)
+ ret = buildtime_deps | runtime_deps
+
+
return ret
def get_system_packages_list(self):