From f0cf5a75c49cc238be932e28e25a203ebbb42ce2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 13 Apr 2009 21:21:53 +0000 Subject: Make portage.bsd_chflags correspond to FEATURES=chflags so that it can be used for related conditionals in shell code. svn path=/main/trunk/; revision=13342 --- bin/misc-functions.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bin/misc-functions.sh') diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 9ffbe0ecc..5e7d29b79 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -492,8 +492,7 @@ install_mask() { } preinst_bsdflags() { - type -P chflags > /dev/null || return 0 - type -P mtree > /dev/null || return 1 + hasq chflags $FEATURES || return # Save all the file flags for restoration after installation. mtree -c -p "${D}" -k flags > "${T}/bsdflags.mtree" # Remove all the file flags so that the merge phase can do anything @@ -503,8 +502,7 @@ preinst_bsdflags() { } postinst_bsdflags() { - type -P chflags > /dev/null || return 0 - type -P mtree > /dev/null || return 1 + hasq chflags $FEATURES || return # Restore all the file flags that were saved before installation. mtree -e -p "${ROOT}" -U -k flags < "${T}/bsdflags.mtree" &> /dev/null } -- cgit v1.2.3-1-g7c22