| 1 |
On Wed, Jun 20, 2018 at 02:10:50AM -0500, Marty E. Plummer wrote: |
| 2 |
> Use ${EROOT%/} whereever possible, as the tools and directories which |
| 3 |
> are used with it are already prefixed with a / |
| 4 |
> |
| 5 |
> Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 6 |
> --- |
| 7 |
> eclass/xdg-utils.eclass | 10 +++++----- |
| 8 |
> 1 file changed, 5 insertions(+), 5 deletions(-) |
| 9 |
> |
| 10 |
> diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass |
| 11 |
> index ac075185d8e..8dba5ed6861 100644 |
| 12 |
> --- a/eclass/xdg-utils.eclass |
| 13 |
> +++ b/eclass/xdg-utils.eclass |
| 14 |
> @@ -15,7 +15,7 @@ |
| 15 |
> # * XDG mime information database management |
| 16 |
> |
| 17 |
> case "${EAPI:-0}" in |
| 18 |
> - 0|1|2|3|4|5|6) ;; |
| 19 |
> + 0|1|2|3|4|5|6|7) ;; |
| 20 |
> *) die "EAPI=${EAPI} is not supported" ;; |
| 21 |
> esac |
| 22 |
> |
| 23 |
> @@ -66,7 +66,7 @@ xdg_environment_reset() { |
| 24 |
> # Updates the .desktop files database. |
| 25 |
> # Generates a list of mimetypes linked to applications that can handle them |
| 26 |
> xdg_desktop_database_update() { |
| 27 |
> - local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}" |
| 28 |
> + local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}" |
| 29 |
|
| 30 |
Shouldn't things like this be $BROOT since they're being run? $EROOT |
| 31 |
might be a different architecture that may or may not run at all on the |
| 32 |
build machine. |
| 33 |
|
| 34 |
-- Jason |
| 35 |
|
| 36 |
> if [[ ${EBUILD_PHASE} != post* ]] ; then |
| 37 |
> die "xdg_desktop_database_update must be used in pkg_post* phases." |
| 38 |
> @@ -78,7 +78,7 @@ xdg_desktop_database_update() { |
| 39 |
> fi |
| 40 |
> |
| 41 |
> ebegin "Updating .desktop files database" |
| 42 |
> - "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}" |
| 43 |
> + "${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}" |
| 44 |
> eend $? |
| 45 |
> } |
| 46 |
> |
| 47 |
> @@ -87,7 +87,7 @@ xdg_desktop_database_update() { |
| 48 |
> # Update the mime database. |
| 49 |
> # Creates a general list of mime types from several sources |
| 50 |
> xdg_mimeinfo_database_update() { |
| 51 |
> - local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}" |
| 52 |
> + local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}" |
| 53 |
> |
| 54 |
> if [[ ${EBUILD_PHASE} != post* ]] ; then |
| 55 |
> die "xdg_mimeinfo_database_update must be used in pkg_post* phases." |
| 56 |
> @@ -99,6 +99,6 @@ xdg_mimeinfo_database_update() { |
| 57 |
> fi |
| 58 |
> |
| 59 |
> ebegin "Updating shared mime info database" |
| 60 |
> - "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}" |
| 61 |
> + "${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}" |
| 62 |
> eend $? |
| 63 |
> } |
| 64 |
> -- |
| 65 |
> 2.17.1 |
| 66 |
> |
| 67 |
> |
Archives