summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 07:38:51 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 07:38:51 +0000
commitd8a33e4fe17f49d873b26f5eaafca8200eedbd64 (patch)
tree99da37913bbe16fa2bb7689a1b50ecb6158392f6
parentFix _setitem() to account for the change to serialize_eclasses = False. (diff)
downloadportage-multirepo-d8a33e4fe17f49d873b26f5eaafca8200eedbd64.tar.gz
portage-multirepo-d8a33e4fe17f49d873b26f5eaafca8200eedbd64.tar.bz2
portage-multirepo-d8a33e4fe17f49d873b26f5eaafca8200eedbd64.zip
Inside dyn_unpack(), only call pre/post phase hooks when src_unpack is
called (when .unpacked does not already exist). (trunk r12804) svn path=/main/branches/2.1.6/; revision=13038
-rwxr-xr-xbin/ebuild.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1f91a7aa..fbccb3dc 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -640,7 +640,6 @@ dyn_setup() {
}
dyn_unpack() {
- [ "$(type -t pre_src_unpack)" == "function" ] && qa_call pre_src_unpack
local newstuff="no"
if [ -e "${WORKDIR}" ]; then
local x
@@ -673,7 +672,6 @@ dyn_unpack() {
if [ -e "${WORKDIR}" ]; then
if [ "$newstuff" == "no" ]; then
vecho ">>> WORKDIR is up-to-date, keeping..."
- [ "$(type -t post_src_unpack)" == "function" ] && qa_call post_src_unpack
return 0
fi
fi
@@ -682,6 +680,7 @@ dyn_unpack() {
install -m${PORTAGE_WORKDIR_MODE:-0700} -d "${WORKDIR}" || die "Failed to create dir '${WORKDIR}'"
fi
cd "${WORKDIR}" || die "Directory change failed: \`cd '${WORKDIR}'\`"
+ [ "$(type -t pre_src_unpack)" == "function" ] && qa_call pre_src_unpack
vecho ">>> Unpacking source..."
ebuild_phase src_unpack
touch "${PORTAGE_BUILDDIR}/.unpacked" || die "IO Failure -- Failed 'touch .unpacked' in ${PORTAGE_BUILDDIR}"