From 2e792d6cca31ec5b65469610cbb004e3fc145995 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Apr 2006 01:51:58 +0000 Subject: Fix FetchlistDict.keys() so it does the same porttrees trick as __getitem__. svn path=/main/trunk/; revision=3120 --- pym/portage.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index 367f43544..0c0fe13fe 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6376,7 +6376,14 @@ class FetchlistDict(UserDict.DictMixin): return pkg_key in self.keys() def keys(self): """Returns keys for all packages within pkgdir""" - return self.db.cp_list(self.cp) + global portdb # has the global auxdb caches + all_trees = portdb.porttrees + # This ensures that the key list comes from the correct portage tree. + portdb.porttrees = self.porttrees + mykeys = portdb.cp_list(self.cp) + # XXX The db is global so we restore it's trees back to their original state. + portdb.porttrees = all_trees + return mykeys def cleanup_pkgmerge(mypkg,origdir): shutil.rmtree(settings["PORTAGE_TMPDIR"]+"/binpkgs/"+mypkg) -- cgit v1.2.3-1-g7c22