| commit | c8472f131a84591c0df5f27b136540bbc14dcf5f | [log] [tgz] |
|---|---|---|
| author | Mike Gilbert <floppym@gentoo.org> | Tue May 08 10:38:31 2018 -0400 |
| committer | Anil Altinay <aaltinay@google.com> | Tue Mar 02 21:28:47 2021 +0000 |
| tree | 7ab163c6f1ef9d79020ecac9f7f0844e9d57b902 | |
| parent | 6b20f511a97d0021a6fe050886961a9c108ff567 [diff] |
fcaps.eclass: don't assume D and ROOT end with a slash BUG=b/179427028 TEST=presubmit RELEASE_NOTE=None Closes: https://bugs.gentoo.org/655244 Change-Id: I78c00d84456226e5b4ff534fcd2ce52a36c0f1fa Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/13216 Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com> Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass index 8ce5b96..822114a 100644 --- a/eclass/fcaps.eclass +++ b/eclass/fcaps.eclass
@@ -111,11 +111,12 @@ 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