On Sat, Apr 12, 2014 at 06:55:17PM -0400, Theodore Ts'o wrote:
> Newer kernels return EACCES instead of EPERM when modifying an acl
> fails. Update the filtering to handle this.
>
> Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
> ---
> tests/generic/237 | 2 +-
> tests/generic/237.out | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/generic/237 b/tests/generic/237
> index 6a61ec8..b068150 100755
> --- a/tests/generic/237
> +++ b/tests/generic/237
> @@ -68,7 +68,7 @@ touch file1
> chown $acl1.$acl1 file1
>
> echo "Expect to FAIL"
> -$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1 | sed
> 's/^setfacl: \/.*file1: Operation not permitted$/setfacl: file1: Operation
> not permitted/'
> +$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1 | sed -e
> 's/Permission denied/Operation not permitted/' -e 's/file1: //' -e
> 's,[/a-zA-Z]*setfacl: ,setfacl: ,'
This is getting unweildy. Can you factor this into a local
_filter_setfacl_error function of some kind? It would also help if
you put a comment iterating all the different output formats it's
now trying to filter out, too.
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
|