Merge pull request #24227 from liewegas/wip-36104-hammer

[ceph.git] / src / ceph.in

diff --git a/src/ceph.in b/src/ceph.in
index 9f857ec6124617a5f48eb03101626ef0070f878e..cf6f9a7a01c193e8fb95a0745dd6ecb9eaa9b9c0 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -447,6 +447,10 @@ def new_style_command(parsed_args, cmdargs, target, sigdict, inbuf, verbose):
                     print >> sys.stderr, \
                             'error handling command target: {0}'.format(e)
                     return 1, '', ''
+                if len(cmdargs) and cmdargs[0] == 'tell':
+                    print >> sys.stderr, \
+                          'Can not use \'tell\' in interactive mode.'
+                    continue
                 valid_dict = validate_command(sigdict, cmdargs, verbose)
                 if valid_dict:
                     if parsed_args.output_format:
@@ -794,9 +798,8 @@ def main():
             childargs = injectargs
         if not len(childargs):
             print >> sys.stderr, \
-                'Cannot use \'tell\' with interactive mode.', \
-                'For an interactive shell,', \
-                'please start "{0}" without non-option arguments.'.format(sys.argv[0])
+                '"{0} tell" requires additional arguments.'.format(sys.argv[0]), \
+                'Try "{0} tell <name> <command> [options...]" instead.'.format(sys.argv[0])
             return errno.EINVAL
 
     # fetch JSON sigs from command