public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] portage r13038 - main/branches/2.1.6/bin
@ 2009-03-11  7:38 Zac Medico (zmedico)
  0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-03-11  7:38 UTC (permalink / raw
  To: gentoo-commits

Author: zmedico
Date: 2009-03-11 07:38:51 +0000 (Wed, 11 Mar 2009)
New Revision: 13038

Modified:
   main/branches/2.1.6/bin/ebuild.sh
Log:
Inside dyn_unpack(), only call pre/post phase hooks when src_unpack is
called (when .unpacked does not already exist). (trunk r12804)

Modified: main/branches/2.1.6/bin/ebuild.sh
===================================================================
--- main/branches/2.1.6/bin/ebuild.sh	2009-03-11 07:37:00 UTC (rev 13037)
+++ main/branches/2.1.6/bin/ebuild.sh	2009-03-11 07:38:51 UTC (rev 13038)
@@ -640,7 +640,6 @@
 }
 
 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 @@
 	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 @@
 		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}"




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-03-11  7:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-11  7:38 [gentoo-commits] portage r13038 - main/branches/2.1.6/bin Zac Medico (zmedico)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox