From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RchgW-0001Xi-3F for garchives@archives.gentoo.org; Mon, 19 Dec 2011 18:11:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A755B21C0F3; Mon, 19 Dec 2011 18:11:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7910C21C0F3 for ; Mon, 19 Dec 2011 18:11:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3C251B400B for ; Mon, 19 Dec 2011 18:11:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 148A780042 for ; Mon, 19 Dec 2011 18:11:27 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: Subject: [gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/prepstrip X-VCS-Directories: bin/ebuild-helpers/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: f81adbe69b1fb4e01bf1cd4470b143f098204fc7 Date: Mon, 19 Dec 2011 18:11:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 58f2d660-0f4c-4397-a443-c2651afe24ff X-Archives-Hash: 5d26c51ad227d719dc0281bb6168dbb0 commit: f81adbe69b1fb4e01bf1cd4470b143f098204fc7 Author: Fabian Groffen gentoo org> AuthorDate: Mon Dec 19 18:11:10 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Dec 19 18:11:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df81adbe6 prepstrip: fix for Prefix, bug #395241 --- 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 84e2edc..137a415 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -263,10 +263,10 @@ if [[ -s ${T}/debug.sources ]] && \ ${debugedit_found} then vecho "installsources: rsyncing source files" - [[ -d ${ED}${prepstrip_sources_dir} ]] || mkdir -p "${ED}${prepstrip_so= urces_dir}" + [[ -d ${D}${prepstrip_sources_dir} ]] || mkdir -p "${D}${prepstrip_sour= ces_dir}" grep -zv '/<[^/>]*>$' "${T}"/debug.sources | \ (cd "${WORKDIR}"; LANG=3DC sort -z -u | \ - rsync -tL0 --files-from=3D- "${WORKDIR}/" "${ED}${prepstrip_sources_di= r}/" ) + rsync -tL0 --files-from=3D- "${WORKDIR}/" "${D}${prepstrip_sources_dir= }/" ) =20 # Preserve directory structure. # Needed after running save_elf_sources. @@ -274,5 +274,5 @@ then while read -r -d $'\0' emptydir do >> "$emptydir"/.keepdir - done < <(find "${ED}${prepstrip_sources_dir}/" -type d -empty -print0) + done < <(find "${D}${prepstrip_sources_dir}/" -type d -empty -print0) fi