diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-19 04:09:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-19 04:09:06 +0000 |
| commit | 0a9316a59e2994599f0782e3b840eda529fb696d (patch) | |
| tree | c3cf6df13d54ee94334965ef8452d8c0d63a8c51 /bin/emerge | |
| parent | 1499b1f1f926bdbfce5e0fb8696b3118db5b4291 (diff) | |
| download | portage-0a9316a59e2994599f0782e3b840eda529fb696d.tar.gz portage-0a9316a59e2994599f0782e3b840eda529fb696d.tar.bz2 portage-0a9316a59e2994599f0782e3b840eda529fb696d.zip | |
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
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 18a4b5c39..822df6bc4 100755 --- 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): |