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: Tue, 30 Aug 2011 17:03:40
Message-Id: 77896f08ed12a93ff6ee8a657ae11501cc2dbc87.zmedico@gentoo
1 commit: 77896f08ed12a93ff6ee8a657ae11501cc2dbc87
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 17:03:05 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 17:03:05 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77896f08
7
8 doebuild: check distfiles digests less often
9
10 If the unpack phase is not going to be executed as a dependency, then
11 we can simply skip the distfiles digest checks if the unpack phase is
12 already marked complete via $PORTAGE_BUILDDIR/.unpacked.
13
14 ---
15 pym/portage/package/ebuild/doebuild.py | 5 ++++-
16 1 files changed, 4 insertions(+), 1 deletions(-)
17
18 diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
19 index 92d73e5..2ab6796 100644
20 --- a/pym/portage/package/ebuild/doebuild.py
21 +++ b/pym/portage/package/ebuild/doebuild.py
22 @@ -684,7 +684,10 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
23 alist = set(mysettings.configdict["pkg"].get("A", "").split())
24
25 unpacked = False
26 - if "unpack" in phases_to_run:
27 + if "unpack" not in phases_to_run:
28 + unpacked = os.path.exists(os.path.join(
29 + mysettings["PORTAGE_BUILDDIR"], ".unpacked"))
30 + else:
31 try:
32 workdir_st = os.stat(mysettings["WORKDIR"])
33 except OSError: