From 87b0ba879ab6eab04f70ffc9dadca329637f8d72 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 21 Jul 2008 06:08:38 +0000 Subject: In dblink._preserve_libs(), strip leading $ROOT from contents paths so that it works when $ROOT != /. svn path=/main/trunk/; revision=11155 --- pym/portage/dbapi/vartree.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f9e3fc9ed..2127cae0a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2107,8 +2107,10 @@ class dblink(object): liblist = linkmap.listLibraryObjects() # get list of libraries from old package instance - old_contents = self._installed_instance.getcontents().keys() - old_libs = set(old_contents).intersection(liblist) + root_len = len(self.myroot) - 1 + old_contents = set(p[root_len:] \ + for p in self._installed_instance.getcontents()) + old_libs = old_contents.intersection(liblist) # get list of libraries from new package instance mylibs = set([os.path.join(os.sep, x) for x in mycontents]).intersection(liblist) -- cgit v1.2.3-1-g7c22