Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
Date: Fri, 18 Nov 2011 21:11:24
Message-Id: c170578a89c2354a595f34b68ab55622dd942252.zmedico@gentoo
1 commit: c170578a89c2354a595f34b68ab55622dd942252
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 18 21:11:05 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 18 21:11:05 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c170578a
7
8 _prepare_self_update: detect if already called
9
10 This is should never be triggered by portage, but it's possible that
11 an API consumer might trigger it somehow.
12
13 ---
14 pym/portage/package/ebuild/doebuild.py | 4 ++++
15 1 files changed, 4 insertions(+), 0 deletions(-)
16
17 diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
18 index 9e71cfc..4ba523c 100644
19 --- a/pym/portage/package/ebuild/doebuild.py
20 +++ b/pym/portage/package/ebuild/doebuild.py
21 @@ -2024,6 +2024,10 @@ def _prepare_self_update(settings):
22 automatically clean up the temporary copies.
23 """
24
25 + # sanity check: ensure that that this routine only runs once
26 + if portage._bin_path != portage.const.PORTAGE_BIN_PATH:
27 + return
28 +
29 # Load lazily referenced portage submodules into memory,
30 # so imports won't fail during portage upgrade/downgrade.
31 _preload_elog_modules(settings)