1 |
Author: zmedico |
2 |
Date: 2008-06-18 21:33:30 +0000 (Wed, 18 Jun 2008) |
3 |
New Revision: 10717 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Bug #228075 - Explicitly call gc.collect() to try and free memory |
9 |
when checking for blockers. This avoids a heap overflow that triggers |
10 |
'Cannot allocate memory' errors (reported with python-2.5). |
11 |
|
12 |
|
13 |
Modified: main/trunk/pym/_emerge/__init__.py |
14 |
=================================================================== |
15 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-18 15:41:54 UTC (rev 10716) |
16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-18 21:33:30 UTC (rev 10717) |
17 |
@@ -5825,6 +5825,12 @@ |
18 |
if self._opts_ignore_blockers.intersection(self.myopts): |
19 |
return None |
20 |
|
21 |
+ # Call gc.collect() here to avoid heap overflow that |
22 |
+ # triggers 'Cannot allocate memory' errors (reported |
23 |
+ # with python-2.5). |
24 |
+ import gc |
25 |
+ gc.collect() |
26 |
+ |
27 |
blocker_dblinks = [] |
28 |
for blocking_pkg in self._blocker_db[ |
29 |
new_pkg.root].findInstalledBlockers(new_pkg, |
30 |
@@ -5838,6 +5844,8 @@ |
31 |
self.pkgsettings[blocking_pkg.root], treetype="vartree", |
32 |
vartree=self.trees[blocking_pkg.root]["vartree"])) |
33 |
|
34 |
+ gc.collect() |
35 |
+ |
36 |
return blocker_dblinks |
37 |
|
38 |
def merge(self, mylist, favorites, mtimedb): |
39 |
|
40 |
-- |
41 |
gentoo-commits@l.g.o mailing list |