diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-08-31 19:54:19 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-31 19:54:19 -0700 |
| commit | d7579ecd27ca051d7f987102caeb53e826a6fe93 (patch) | |
| tree | b1192edbeeffea84b8817522c5e7697100163a8f /bin/ebuild-helpers/doins | |
| parent | ce501b36d7078db059c606d3b4f38637ad09528e (diff) | |
| download | portage-d7579ecd27ca051d7f987102caeb53e826a6fe93.tar.gz portage-d7579ecd27ca051d7f987102caeb53e826a6fe93.tar.bz2 portage-d7579ecd27ca051d7f987102caeb53e826a6fe93.zip | |
Revert "xml/metadata: implement XMLParser.doctype()"
This reverts commit ce501b36d7078db059c606d3b4f38637ad09528e.
This commit had lots of unintended changes included.
Diffstat (limited to 'bin/ebuild-helpers/doins')
| -rwxr-xr-x | bin/ebuild-helpers/doins | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins index 1ca69a6e9..7dec14682 100755 --- a/bin/ebuild-helpers/doins +++ b/bin/ebuild-helpers/doins @@ -27,14 +27,12 @@ else DOINSRECUR=n fi -case "$EAPI" in 0|1|2) export ED="${D}" ;; esac - -if [[ ${INSDESTTREE#${ED}} != "${INSDESTTREE}" ]]; then +if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then vecho "-------------------------------------------------------" 1>&2 - vecho "You should not use \${ED} with helpers." 1>&2 + vecho "You should not use \${D} with helpers." 1>&2 vecho " --> ${INSDESTTREE}" 1>&2 vecho "-------------------------------------------------------" 1>&2 - helpers_die "${0##*/} used with \${ED}" + helpers_die "${0##*/} used with \${D}" exit 1 fi @@ -51,7 +49,7 @@ export TMP=$T/.doins_tmp # Use separate directories to avoid potential name collisions. mkdir -p "$TMP"/{1,2} -[[ ! -d ${ED}${INSDESTTREE} ]] && dodir "${INSDESTTREE}" +[[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}" _doins() { local mysrc="$1" mydir="$2" cleanup="" rval @@ -65,8 +63,8 @@ _doins() { # $PORTAGE_ACTUAL_DISTDIR/. if [ $PRESERVE_SYMLINKS = y ] && \ ! [[ $(readlink "$mysrc") == "$PORTAGE_ACTUAL_DISTDIR"/* ]] ; then - rm -rf "${ED}$INSDESTTREE/$mydir/${mysrc##*/}" || return $? - cp -P "$mysrc" "${ED}$INSDESTTREE/$mydir/${mysrc##*/}" + rm -rf "$D$INSDESTTREE/$mydir/${mysrc##*/}" || return $? + cp -P "$mysrc" "$D$INSDESTTREE/$mydir/${mysrc##*/}" return $? else cp "$mysrc" "$TMP/2/${mysrc##*/}" || return $? @@ -75,7 +73,7 @@ _doins() { fi fi - install ${INSOPTIONS} "${mysrc}" "${ED}${INSDESTTREE}/${mydir}" + install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}" rval=$? [[ -n ${cleanup} ]] && rm -f "${cleanup}" [ $rval -ne 0 ] && echo "!!! ${0##*/}: $mysrc does not exist" 1>&2 |