From: Patrick Donnelly Date: Sun, 12 Aug 2018 22:01:34 +0000 (-0700) Subject: cephfs-shell: avoid sys.argv modification X-Git-Tag: v14.0.1~604^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e6c33aa09bc40044acaaa128f762aa2c7472955d;p=ceph-ci.git cephfs-shell: avoid sys.argv modification In multiple locations in the code. Signed-off-by: Patrick Donnelly --- diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell index bb23263f738..7b18fe1b490 100644 --- 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(','))