Handle eos EPERM as permission denied

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Sep 18, 2020 · f9e7ecc · f9e7ecc
1 parent d9ace48
commit f9e7ecc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog/unreleased/handle-eos-eperm.md b/changelog/unreleased/handle-eos-eperm.md
@@ -0,0 +1,6 @@
+Bugfix: Fix litmus failing on ocis storage
+
+We now ignore the `no data available` error when removing a non existing metadata attribute, which is ok because we are trying to delete it anyway.
+
+https://github.com/cs3org/reva/issues/1178
+https://github.com/cs3org/reva/pull/1179
diff --git a/pkg/eosclient/eosclient.go b/pkg/eosclient/eosclient.go
@@ -247,7 +247,7 @@ func (c *Client) executeEOS(ctx context.Context, cmd *exec.Cmd) (string, string,
 				err = nil
 			case 2:
 				err = errtypes.NotFound(errBuf.String())
-			case 22:
+			case 1, 22:
 				// eos reports back error code 22 when the user is not allowed to enter the instance
 				err = errtypes.PermissionDenied(errBuf.String())
 			}