[gentoo-dev] [PATCH] fcaps.eclass: skip fcaps() on Prefix.

2020-03-08 Thread heroxbd
From: Benda Xu 

Gentoo Prefix runs with a normal user and cannot grant extra
capabilities.  Exit gracefully with a message.

Signed-off-by: Benda Xu 
---
 eclass/fcaps.eclass | 5 +
 1 file changed, 5 insertions(+)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 467f955f5e9a..fb0af8cbbde6 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
 fcaps() {
debug-print-function ${FUNCNAME} "$@"
 
+   if [[ ${EUID} != 0 ]] ; then
+   einfo "Insufficient privileges to execute ${FUNCNAME}, 
skipping."
+   return 0
+   fi
+
# Process the user options first.
local owner='root'
local group='0'
-- 
2.25.0




Re: [gentoo-dev] [PATCH] fcaps.eclass: skip fcaps() on Prefix.

2020-03-08 Thread Mike Gilbert
On Sun, Mar 8, 2020 at 5:20 AM  wrote:
>
> From: Benda Xu 
>
> Gentoo Prefix runs with a normal user and cannot grant extra
> capabilities.  Exit gracefully with a message.
>
> Signed-off-by: Benda Xu 
> ---
>  eclass/fcaps.eclass | 5 +
>  1 file changed, 5 insertions(+)
>
> diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
> index 467f955f5e9a..ddc4d3ccc6d8 100644
> --- a/eclass/fcaps.eclass
> +++ b/eclass/fcaps.eclass
> @@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
>  fcaps() {
> debug-print-function ${FUNCNAME} "$@"
>
> +   if [[ ${EUID} != 0 ]] ; then
> +   einfo "Insufficient privileges to execute ${FUNCNAME}, skip."
> +   return 0
> +   fi
> +

It seems like you are commanding the user to skip.

s/skip/skipping/



[gentoo-dev] [PATCH] fcaps.eclass: skip fcaps() on Prefix.

2020-03-08 Thread heroxbd
From: Benda Xu 

Gentoo Prefix runs with a normal user and cannot grant extra
capabilities.  Exit gracefully with a message.

Signed-off-by: Benda Xu 
---
 eclass/fcaps.eclass | 5 +
 1 file changed, 5 insertions(+)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 467f955f5e9a..ddc4d3ccc6d8 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
 fcaps() {
debug-print-function ${FUNCNAME} "$@"
 
+   if [[ ${EUID} != 0 ]] ; then
+   einfo "Insufficient privileges to execute ${FUNCNAME}, skip."
+   return 0
+   fi
+
# Process the user options first.
local owner='root'
local group='0'
-- 
2.25.0