From 2b45d9efd30ca4c9aa10ab071aad2cf3e1daf090 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Mon, 28 Jan 2008 10:47:47 +0000 Subject: [PATCH] another whoops fixed git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1106 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropyTools.py | 4 ++-- libraries/portageTools.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py index 259a73dd2..37fa159ca 100644 --- a/libraries/entropyTools.py +++ b/libraries/entropyTools.py @@ -2069,8 +2069,8 @@ def extractPkgData(package, etpBranch = etpConst['branch'], silent = False, inje else: data['useflags'].append("-"+x) data['sources'] = portage_metadata['SRC_URI'].split() - data['dependencies'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if not x.startswith("!")] - data['conflicts'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if x.startswith("!")] + data['dependencies'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if not x.startswith("!") and if not x in ("(","||",")","")] + data['conflicts'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if x.startswith("!") and if not x in ("(","||",")","")] if (kernelDependentModule): # add kname to the dependency diff --git a/libraries/portageTools.py b/libraries/portageTools.py index 0085da971..bd0122ae2 100644 --- a/libraries/portageTools.py +++ b/libraries/portageTools.py @@ -345,6 +345,7 @@ def calculate_dependencies(my_iuse, my_use, my_license, my_depend, my_rdepend, m use = [f for f in use if f in iuse] use.sort() metadata['USE'] = " ".join(use) + # FIXME: there's some portage trunk stuff try: from portage_dep import paren_reduce, use_reduce, paren_enclose p_normalize = paren_normalize