From 95e8807a6f1e12a01970aa54a69c8fc4a9231096 Mon Sep 17 00:00:00 2001 From: worch Date: Tue, 29 Jul 2008 15:10:28 -0500 Subject: [PATCH] Broken libtools are run through the method to removed masked directories. --- pym/portage/sets/revdep.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pym/portage/sets/revdep.py b/pym/portage/sets/revdep.py index ab22eba..46641d5 100644 --- a/pym/portage/sets/revdep.py +++ b/pym/portage/sets/revdep.py @@ -67,6 +67,13 @@ class MissingLibraryConsumerSet(LibraryConsumerSet): if self.debug: timeListBrokenBinaries = time.time() - timeStart + # Add broken libtool libraries into the brokenDependencies dict + if self.debug: + timeStart = time.time() + brokenDependencies.update(self.listBrokenLibtoolLibraries()) + if self.debug: + timeLibtool = time.time() - timeStart + # FIXME Too many atoms may be emerged because libraries in binary # packages are not being handled properly eg openoffice, nvidia-drivers, # sun-jdk. Certain binaries are run in an environment where additional @@ -94,15 +101,8 @@ class MissingLibraryConsumerSet(LibraryConsumerSet): if self.debug: timeMask = time.time() - timeStart - # TODO Test if the libtool libs need to be masks or not. - # Add broken libtool libraries into the brokenDependencies dict - if self.debug: - timeStart = time.time() - brokenDependencies.update(self.listBrokenLibtoolLibraries()) - if self.debug: - timeLibtool = time.time() - timeStart - - # Determine atoms to emerge based on broken binaries in brokenDependencies. + # Determine atoms to emerge based on broken binaries in + # brokenDependencies. if self.debug: timeStart = time.time() if brokenDependencies: @@ -124,15 +124,15 @@ class MissingLibraryConsumerSet(LibraryConsumerSet): print x print print "listBrokenBinaries time:", timeListBrokenBinaries - print "Mask time:", timeMask print "Libtool time:", timeLibtool + print "Mask time:", timeMask print "mapPathsToAtoms time:", timeAtoms print self._setAtoms(atoms) def filterBinaries(self, dependencies): - """This method is unused and for testing atm.""" + """This method is unused and only for testing atm.""" rValue = dependencies.copy() filter = set(['/bin','/sbin','/usr/bin','/usr/sbin','/lib','/usr/lib',]) -- 2.11.4.GIT