From 472dedfe5c3d6d574f39da290942dd44fa0a81bd Mon Sep 17 00:00:00 2001 From: lxnay Date: Wed, 9 Apr 2008 10:15:21 +0000 Subject: [PATCH] fixing some stuff from previous commit git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1625 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/databaseTools.py | 3 ++- libraries/entropy.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py index 38bd5283e..d69323b2c 100644 --- a/libraries/databaseTools.py +++ b/libraries/databaseTools.py @@ -2372,7 +2372,8 @@ class etpDatabase: mydata = set() for data in results: pathfile = os.path.dirname(data[1]) - if pathfile in ldpaths: + myfilename = os.path.basename(data[1]) + if (needed == myfilename) and (pathfile in ldpaths): mydata.add(data) self.storeSearchCache(needed,'resolveNeeded',mydata) diff --git a/libraries/entropy.py b/libraries/entropy.py index 9bcca0f01..1bb174bf2 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -11195,6 +11195,8 @@ class ServerInterface(TextInterface): deps_content |= dbconn.retrieveContent(match[0]) key, slot = dbconn.retrieveKeySlot(match[0]) dependencies_cache.add((key,slot)) + key, slot = dbconn.retrieveKeySlot(idpackage) + dependencies_cache.add((key,slot)) ldpaths = self.entropyTools.collectLinkerPaths() deps_content = set([x for x in deps_content if os.path.dirname(x) in ldpaths]) print "neededs:",neededs