Bug #228075 - Explicitly call gc.collect() to try and free memory

when checking for blockers. This avoids a heap overflow that triggers
'Cannot allocate memory' errors (reported with python-2.5).
(trunk r10717)

svn path=/main/branches/2.1.2/; revision=10722

diff --git a/bin/emerge b/bin/emerge
index 18a4b5c395e57873fc1f0bc2672b44bdb40e9b0e..822df6bc4fc605cb2332e8fb71a186f99e4394cd 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -5917,6 +5917,12 @@ class MergeTask(object):
                if self._opts_ignore_blockers.intersection(self.myopts):
                        return None
 
+               # Call gc.collect() here to avoid heap overflow that
+               # triggers 'Cannot allocate memory' errors (reported
+               # with python-2.5).
+               import gc
+               gc.collect()
+
                blocker_dblinks = []
                for blocking_pkg in self._blocker_db[
                        new_pkg.root].findInstalledBlockers(new_pkg,
@@ -5930,6 +5936,8 @@ class MergeTask(object):
                                self.pkgsettings[blocking_pkg.root], treetype="vartree",
                                vartree=self.trees[blocking_pkg.root]["vartree"]))
 
+               gc.collect()
+
                return blocker_dblinks
 
        def merge(self, mylist, favorites, mtimedb):