Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: freedesktop-bugs@g.o
Subject: [gentoo-dev] [PATCH 1/5] xdg-utils.eclass: avoid duplicate leading slashes
Date: Sun, 30 Sep 2018 22:50:43
Message-Id: 20180930225035.25434-1-floppym@gentoo.org
1 Signed-off-by: Mike Gilbert <floppym@g.o>
2 ---
3 eclass/xdg-utils.eclass | 8 ++++----
4 1 file changed, 4 insertions(+), 4 deletions(-)
5
6 diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
7 index 2c2d2324c2b7..725b67316221 100644
8 --- a/eclass/xdg-utils.eclass
9 +++ b/eclass/xdg-utils.eclass
10 @@ -67,7 +67,7 @@ xdg_environment_reset() {
11 # Updates the .desktop files database.
12 # Generates a list of mimetypes linked to applications that can handle them
13 xdg_desktop_database_update() {
14 - local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}"
15 + local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}"
16
17 if [[ ${EBUILD_PHASE} != post* ]] ; then
18 die "xdg_desktop_database_update must be used in pkg_post* phases."
19 @@ -79,7 +79,7 @@ xdg_desktop_database_update() {
20 fi
21
22 ebegin "Updating .desktop files database"
23 - "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}"
24 + "${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
25 eend $?
26 }
27
28 @@ -88,7 +88,7 @@ xdg_desktop_database_update() {
29 # Update the mime database.
30 # Creates a general list of mime types from several sources
31 xdg_mimeinfo_database_update() {
32 - local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}"
33 + local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}"
34
35 if [[ ${EBUILD_PHASE} != post* ]] ; then
36 die "xdg_mimeinfo_database_update must be used in pkg_post* phases."
37 @@ -100,6 +100,6 @@ xdg_mimeinfo_database_update() {
38 fi
39
40 ebegin "Updating shared mime info database"
41 - "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}"
42 + "${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
43 eend $?
44 }
45 --
46 2.19.0

Replies