commit:     06ac51cf5bdb3220d427819cdfafdab231e4a4f8
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May  8 14:38:31 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May  8 14:38:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ac51cf

fcaps.eclass: don't assume D and ROOT end with a slash

Closes: https://bugs.gentoo.org/655244

 eclass/fcaps.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 7b388849df6..467f955f5e9 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -110,11 +110,12 @@ fcaps() {
                root=${EROOT:-${ROOT}}
                ;;
        esac
+       root=${root%/}
 
        # Process every file!
        local file
        for file ; do
-               [[ ${file} != /* ]] && file="${root}${file}"
+               [[ ${file} != /* ]] && file="${root}/${file}"
 
                if use filecaps ; then
                        # Try to set capabilities.  Ignore errors when the

Reply via email to