From 2e6fa11b074d67ebeb799210256d4716d6655a97 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 9 Oct 2011 18:53:53 -0400 Subject: prepstrip: merge debugedit checks Avoid checking for debugedit multiple times. Signed-off-by: Mike Frysinger --- bin/ebuild-helpers/prepstrip | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 5f0fe18fe..5167ef329 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -25,11 +25,6 @@ export SAFE_STRIP_FLAGS="--strip-unneeded" export PORTAGE_STRIP_FLAGS=${PORTAGE_STRIP_FLAGS-${SAFE_STRIP_FLAGS} -R .comment} prepstrip_sources_dir=/usr/src/debug/${CATEGORY}/${PF} -if has installsources ${FEATURES} && ! type -P debugedit >/dev/null ; then - ewarn "FEATURES=installsources is enabled but the debugedit binary could not" - ewarn "be found. This feature will not work unless debugedit is installed!" -fi - unset ${!INODE_*} inode_var_name() { @@ -43,7 +38,11 @@ inode_var_name() { save_elf_sources() { has installsources ${FEATURES} || return 0 has installsources ${RESTRICT} && return 0 - type -P debugedit >/dev/null || return 0 + if ! type -P debugedit >/dev/null ; then + ewarn "FEATURES=installsources is enabled but the debugedit binary could not" + ewarn "be found. This feature will not work unless debugedit is installed!" + return 0 + fi local x=$1 local inode=$(inode_var_name "$x") -- cgit v1.2.3-1-g7c22