From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 14 May 2012 22:50:31 +0000 (-0700)
Subject: prepstrip: fix installsources breakage
X-Git-Tag: v2.2.0_alpha105~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd0d2264225c44503283bd1d144815167d245be6;p=portage.git

prepstrip: fix installsources breakage

The debug.sources path changed in commit
4941c3c674400116f118a9c75b520c3fd1a25490.
---

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index deb5cabc5..85d5d6a86 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -297,15 +297,15 @@ done
 # parallel, but not sure that'd be an overall improvement.
 multijob_finish
 
-cat "${tmpdir}"/sources/* > "${tmpdir}/debug.sources" 2>/dev/null
-if [[ -s ${T}/debug.sources ]] && \
+cd "${tmpdir}"/sources/ && cat * > "${tmpdir}/debug.sources" 2>/dev/null
+if [[ -s ${tmpdir}/debug.sources ]] && \
    ${FEATURES_installsources} && \
    ! ${RESTRICT_installsources} && \
    ${debugedit_found}
 then
 	vecho "installsources: rsyncing source files"
 	[[ -d ${D}${prepstrip_sources_dir} ]] || mkdir -p "${D}${prepstrip_sources_dir}"
-	grep -zv '/<[^/>]*>$' "${T}"/debug.sources | \
+	grep -zv '/<[^/>]*>$' "${tmpdir}"/debug.sources | \
 		(cd "${WORKDIR}"; LANG=C sort -z -u | \
 		rsync -tL0 --files-from=- "${WORKDIR}/" "${D}${prepstrip_sources_dir}/" )