prepstrip: fix installsources breakage
authorZac Medico <zmedico@gentoo.org>
Mon, 14 May 2012 22:50:31 +0000 (15:50 -0700)
committerZac Medico <zmedico@gentoo.org>
Mon, 14 May 2012 22:55:30 +0000 (15:55 -0700)
The debug.sources path changed in commit
4941c3c674400116f118a9c75b520c3fd1a25490.

bin/ebuild-helpers/prepstrip

index deb5cabc5fc98a2f9aa7d7f45209dc47dab4ecdf..85d5d6a866756b7bf33f82312b6b3b9204596c43 100755 (executable)
@@ -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}/" )