diff options
| author |   David Seifert <soap@gentoo.org> | 2019-05-25 18:11:05 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2019-05-25 18:11:05 +0200 |
| commit | bf698cecb081079d6204637f692e33101abed805 (patch) | |
| tree | de8117bb322252f8c6e9af7fc560f775ec626e46 /eclass | |
| parent | net-misc/memcached: 1.5.16 bump with 1.5.15 cleanup (diff) | |
| download | gentoo-bf698cecb081079d6204637f692e33101abed805.tar.gz gentoo-bf698cecb081079d6204637f692e33101abed805.tar.bz2 gentoo-bf698cecb081079d6204637f692e33101abed805.zip | |
savedconfig.eclass: Remove old EAPI ED/EROOT workarounds
* Also limit to EAPIs that are in use at the moment.
Closes: https://bugs.gentoo.org/685382
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/savedconfig.eclass | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass index 1e9ac6c80b4d..c4a0ccdc8fa0 100644 --- a/eclass/savedconfig.eclass +++ b/eclass/savedconfig.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: savedconfig.eclass @@ -33,6 +33,11 @@ inherit portability IUSE="savedconfig" +case ${EAPI} in + [4-7]) ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; +esac + # @FUNCTION: save_config # @USAGE: <config files to save> # @DESCRIPTION: @@ -46,19 +51,16 @@ save_config() { fi [[ $# -eq 0 ]] && die "Usage: save_config <files>" - # Be lazy in our EAPI compat - : ${ED:=${D}} - local dest="/etc/portage/savedconfig/${CATEGORY}" if [[ $# -eq 1 && -f $1 ]] ; then # Just one file, so have the ${PF} be that config file dodir "${dest}" - cp "$@" "${ED}/${dest}/${PF}" || die "failed to save $*" + cp "$@" "${ED%/}/${dest}/${PF}" || die "failed to save $*" else # A dir, or multiple files, so have the ${PF} be a dir # with all the saved stuff below it dodir "${dest}/${PF}" - treecopy "$@" "${ED}/${dest}/${PF}" || die "failed to save $*" + treecopy "$@" "${ED%/}/${dest}/${PF}" || die "failed to save $*" fi elog "Your configuration for ${CATEGORY}/${PF} has been saved in " @@ -99,7 +101,7 @@ restore_config() { use savedconfig || return local found check configfile - local base=${PORTAGE_CONFIGROOT}/etc/portage/savedconfig + local base=${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do configfile=${base}/${CTARGET}/${check} [[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check} @@ -143,10 +145,7 @@ savedconfig_pkg_postinst() { # are worse :/. if use savedconfig ; then - # Be lazy in our EAPI compat - : ${EROOT:=${ROOT}} - - find "${EROOT}/etc/portage/savedconfig/${CATEGORY}/${PF}" \ + find "${EROOT%/}/etc/portage/savedconfig/${CATEGORY}/${PF}" \ -exec touch {} + 2>/dev/null fi } |