diff options
| author |   Kevin F. Quinn <kevquinn@gentoo.org> | 2006-12-02 12:24:50 +0000 |
|---|---|---|
| committer | Kevin F. Quinn <kevquinn@gentoo.org> | 2006-12-02 12:24:50 +0000 |
| commit | 6b6d5ac45fe3c90504e72788c89f4b443942dfd5 (patch) | |
| tree | f6b797bb763b7ce58a993037c098722a4e720eb6 /eclass | |
| parent | Collapse tetex dependencies to virtual/tetex, thanks to Sebastian Schubert fo... (diff) | |
| download | gentoo-2-6b6d5ac45fe3c90504e72788c89f4b443942dfd5.tar.gz gentoo-2-6b6d5ac45fe3c90504e72788c89f4b443942dfd5.tar.bz2 gentoo-2-6b6d5ac45fe3c90504e72788c89f4b443942dfd5.zip | |
bugfix: only avoid the fallback to scanelf if PAX_MARKING is "none".
elog the successful file lists.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/pax-utils.eclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass index b5ab1506c21c..e4937bde7ff8 100644 --- a/eclass/pax-utils.eclass +++ b/eclass/pax-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.4 2006/12/02 11:33:04 kevquinn Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.5 2006/12/02 12:24:50 kevquinn Exp $ # Author: # Kevin F. Quinn <kevquinn@gentoo.org> @@ -89,9 +89,9 @@ pax-mark() { # Try chpax, for (deprecated) EI legacy marking. if type -p chpax > /dev/null && hasq EI ${PAX_MARKINGS}; then einfo "Legacy EI PaX marking -${flags}" - _pax_list_files echo "$@" + _pax_list_files elog "$@" for f in "$@"; do - /sbin/chpax -${flags} "${f}" && continue + chpax -${flags} "${f}" && continue fail=1 failures="${failures} ${f}" done @@ -101,22 +101,22 @@ pax-mark() { if type -p paxctl > /dev/null && hasq PT ${PAX_MARKINGS}; then # Try paxctl, the upstream supported tool. einfo "PT PaX marking -${flags}" - _pax_list_files echo "$@" + _pax_list_files elog "$@" for f in "$@"; do - /sbin/paxctl -q${flags} "${f}" && continue - /sbin/paxctl -qc${flags} "${f}" && continue - /sbin/paxctl -qC${flags} "${f}" && continue + paxctl -q${flags} "${f}" && continue + paxctl -qc${flags} "${f}" && continue + paxctl -qC${flags} "${f}" && continue fail=1 failures="${failures} ${f}" done - elif type -p scanelf > /dev/null && [[ -n ${PAX_MARKINGS} ]]; then + elif type -p scanelf > /dev/null && [[ ${PAX_MARKINGS} != "none" ]]; then # Try scanelf, Gentoo's swiss-army knife ELF utility # Currently this sets EI and PT if it can, no option to # control what it does. einfo "Fallback PaX marking -${flags}" - _pax_list_files echo "$@" - /usr/bin/scanelf -Xxz ${flags} "$@" - else + _pax_list_files elog "$@" + scanelf -Xxz ${flags} "$@" + elif [[ ${PAX_MARKINGS} != "none" ]]; then # Out of options! failures="$*" fail=1 |