diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-14 15:50:31 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-14 15:55:30 -0700 |
| commit | dd0d2264225c44503283bd1d144815167d245be6 (patch) | |
| tree | 21fadc906d5fb224e0ca27e527078ab5ca91467c /bin/ebuild-helpers | |
| parent | 9ed00a9e70a3705164a5349145ff467e5c40ddfd (diff) | |
| download | portage-dd0d2264225c44503283bd1d144815167d245be6.tar.gz portage-dd0d2264225c44503283bd1d144815167d245be6.tar.bz2 portage-dd0d2264225c44503283bd1d144815167d245be6.zip | |
prepstrip: fix installsources breakage
The debug.sources path changed in commit
4941c3c674400116f118a9c75b520c3fd1a25490.
Diffstat (limited to 'bin/ebuild-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/prepstrip | 6 |
1 files changed, 3 insertions, 3 deletions
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}/" ) |