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 1RD9Ks-0004Dt-6v for garchives@archives.gentoo.org; Mon, 10 Oct 2011 06:27:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F6F621C06A; Mon, 10 Oct 2011 06:27:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B55D21C06A for ; Mon, 10 Oct 2011 06:27:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1AB61B401A for ; Mon, 10 Oct 2011 06:27:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 11AD580042 for ; Mon, 10 Oct 2011 06:27:29 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master 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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: aeced1ac893951aec4992b2a1af7a4d057d6ce24 Date: Mon, 10 Oct 2011 06:27:29 +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: X-Archives-Hash: 6b10187623b9d4edf20aac4278fc36d0 commit: aeced1ac893951aec4992b2a1af7a4d057d6ce24 Author: Zac Medico gentoo org> AuthorDate: Mon Oct 10 06:27:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 10 06:27:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Daeced1ac prepstrip: tweak style of debugedit checks Make the checks more like the FEATURES/RESTRICT checks from commit 286675a500998e536dbbf2ee2dfe1fedf4290b38. --- bin/ebuild-helpers/prepstrip | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index bd51843..68b2133 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -36,9 +36,9 @@ type -P -- ${OBJCOPY} > /dev/null || OBJCOPY=3Dobjcopy export SAFE_STRIP_FLAGS=3D"--strip-unneeded" export PORTAGE_STRIP_FLAGS=3D${PORTAGE_STRIP_FLAGS-${SAFE_STRIP_FLAGS} -= R .comment} prepstrip_sources_dir=3D/usr/src/debug/${CATEGORY}/${PF} -type -P debugedit >/dev/null -debugedit_found=3D$? -debugedit_warned=3D + +type -P debugedit >/dev/null && debugedit_found=3Dtrue || debugedit_foun= d=3Dfalse +debugedit_warned=3Dfalse =20 unset ${!INODE_*} =20 @@ -53,9 +53,9 @@ inode_var_name() { save_elf_sources() { ${FEATURES_installsources} || return 0 ${RESTRICT_installsources} && return 0 - if [ ${debugedit_found} -ne 0 ] ; then - if [ -z ${debugedit_warned} ] ; then - debugedit_warned=3D1 + if ! ${debugedit_found} ; then + if ! ${debugedit_warned} ; then + debugedit_warned=3Dtrue ewarn "FEATURES=3Dinstallsources is enabled but the debugedit binary = could not" ewarn "be found. This feature will not work unless debugedit is insta= lled!" fi @@ -79,7 +79,7 @@ save_elf_debug() { [[ ${x} =3D=3D *".debug" ]] && return 0 =20 # this will recompute the build-id, but for now that's ok - local buildid=3D"$( [ ${debugedit_found} -eq 0 ] && debugedit -i "${x}"= )" + local buildid=3D"$( ${debugedit_found} && debugedit -i "${x}" )" =20 mkdir -p $(dirname "${y}") =20 @@ -191,7 +191,7 @@ done if [[ -s ${T}/debug.sources ]] && \ ${FEATURES_installsources} && \ ! ${RESTRICT_installsources} && \ - [ ${debugedit_found} -eq 0 ] + ${debugedit_found} then vecho "installsources: rsyncing source files" [[ -d ${D}${prepstrip_sources_dir} ]] || mkdir -p "${D}${prepstrip_sour= ces_dir}"