On Wed, Jun 20, 2018 at 02:10:50AM -0500, Marty E. Plummer wrote:
> Use ${EROOT%/} whereever possible, as the tools and directories which
> are used with it are already prefixed with a /
>
> Package-Manager: Portage-2.3.40, Repoman-2.3.9
> ---
> eclass/xdg-utils.eclass | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
> index ac075185d8e..8dba5ed6861 100644
> --- a/eclass/xdg-utils.eclass
> +++ b/eclass/xdg-utils.eclass
> @@ -15,7 +15,7 @@
> # * XDG mime information database management
>
> case "${EAPI:-0}" in
> - 0|1|2|3|4|5|6) ;;
> + 0|1|2|3|4|5|6|7) ;;
> *) die "EAPI=${EAPI} is not supported" ;;
> esac
>
> @@ -66,7 +66,7 @@ xdg_environment_reset() {
> # Updates the .desktop files database.
> # Generates a list of mimetypes linked to applications that can handle them
> xdg_desktop_database_update() {
> - local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}"
> + local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}"
Shouldn't things like this be $BROOT since they're being run? $EROOT
might be a different architecture that may or may not run at all on the
build machine.
-- Jason
> if [[ ${EBUILD_PHASE} != post* ]] ; then
> die "xdg_desktop_database_update must be used in pkg_post*
> phases."
> @@ -78,7 +78,7 @@ xdg_desktop_database_update() {
> fi
>
> ebegin "Updating .desktop files database"
> - "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}"
> + "${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
> eend $?
> }
>
> @@ -87,7 +87,7 @@ xdg_desktop_database_update() {
> # Update the mime database.
> # Creates a general list of mime types from several sources
> xdg_mimeinfo_database_update() {
> - local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}"
> + local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}"
>
> if [[ ${EBUILD_PHASE} != post* ]] ; then
> die "xdg_mimeinfo_database_update must be used in pkg_post*
> phases."
> @@ -99,6 +99,6 @@ xdg_mimeinfo_database_update() {
> fi
>
> ebegin "Updating shared mime info database"
> - "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}"
> + "${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
> eend $?
> }
> --
> 2.17.1
>
>
