From: lu.shasha <lu.shasha@eisoo.com>
Date: Wed, 24 May 2017 06:54:23 +0000 (+0800)
Subject: rgw: fix "radosgw-admin user rm" retcode
X-Git-Tag: v12.1.0~216^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b574394ede9a1bb4dc6c7bb54769979f9a18191;p=ceph.git

rgw: fix "radosgw-admin user rm" retcode

when user.remove got negative retcode should return

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index bcfb8075660b8..4fb70b1a485fd 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -4490,9 +4490,7 @@ int main(int argc, const char **argv)
     break;
   case OPT_USER_RM:
     ret = user.remove(user_op, &err_msg);
-    if (ret == -ENOENT) {
-      cerr << err_msg << std::endl;
-    } else if (ret < 0) {
+    if (ret < 0) {
       cerr << "could not remove user: " << err_msg << std::endl;
       return -ret;
     }