cephfs-shell: avoid sys.argv modification

In multiple locations in the code.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell
index bb23263f73819c365b4e57a3666d9a210d15895c..7b18fe1b4907a1ac31ac87b2ff9691647cc8bdbd 100644 (file)
--- a/src/tools/cephfs/cephfs-shell
+++ b/src/tools/cephfs/cephfs-shell
@@ -916,15 +916,12 @@ if __name__ == '__main__':
     main_parser.add_argument('-c', '--config', action = 'store', help = 'Configuration file_path', type = str)
     main_parser.add_argument('-b', '--batch', action = 'store', help = 'Batch File path.', type = str)
     main_parser.add_argument('-t', '--test', action='store', help='Test against transcript(s) in FILE', nargs = '+')
-    main_parser.add_argument('commands', nargs='*', help='comma delimited commands')  
+    main_parser.add_argument('commands', nargs='*', help='comma delimited commands', default=[])
     args = main_parser.parse_args()
     if args.config:
         config_file = args.config
-        sys.argv = [sys.argv[0]] + sys.argv[3:]  
     if args.batch:
-        sys.argv[1] = 'load ' + args.batch
-        sys.argv[2] = 'quit'
-        sys.argv = sys.argv[:3]   
+        args.commands = ['load ' + args.batch, 'quit']
     sys.argv.clear()
     sys.argv.append(exe)
     sys.argv.extend(' '.join(args.commands).split(','))