diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-08-15 05:14:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-15 05:14:35 +0000 |
| commit | 456b4ddb338946a5910389ced029610cb2c594dd (patch) | |
| tree | 66aa85d2db5e1c19a39ec568879a1e1f7b545863 /sys-devel/binutils-config/files | |
| parent | old (diff) | |
| download | gentoo-2-456b4ddb338946a5910389ced029610cb2c594dd.tar.gz gentoo-2-456b4ddb338946a5910389ced029610cb2c594dd.tar.bz2 gentoo-2-456b4ddb338946a5910389ced029610cb2c594dd.zip | |
Fix incorrect header deletion when switching profiles #330299 by Pinky.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/binutils-config/files')
| -rwxr-xr-x | sys-devel/binutils-config/files/binutils-config-2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys-devel/binutils-config/files/binutils-config-2 b/sys-devel/binutils-config/files/binutils-config-2 index 6b172dbc6f8a..e5a36d0c7ec8 100755 --- a/sys-devel/binutils-config/files/binutils-config-2 +++ b/sys-devel/binutils-config/files/binutils-config-2 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.1 2009/12/20 19:56:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.2 2010/08/15 05:14:35 vapier Exp $ # Format of /etc/env.d/binutils/: # config-TARGET: CURRENT=version for TARGET @@ -159,8 +159,8 @@ switch_profile() { ln -sf "${INCPATH}/${x}" "${ROOT}/usr/include/${x}" done else - # Clean out old path - find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" + + # Clean out old path -- cannot use '-exec {} +' syntax here + find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \; rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null rmdir "${ROOT}/usr/${TARGET}" >& /dev/null @@ -358,7 +358,7 @@ while [[ $# -gt 0 ]] ; do ;; -V|--version) unset Header - cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.1 2009/12/20 19:56:57 vapier Exp $" + cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.2 2010/08/15 05:14:35 vapier Exp $" cvsver=${cvsver##*binutils-config-} bver=${cvsver%%,v *} cvsver=${cvsver#* } |