From e07b5e42d6278fbaff59a2b6b04dae4b33387886 Mon Sep 17 00:00:00 2001 From: nao20010128nao Date: Fri, 28 Feb 2020 01:26:56 +0000 Subject: [PATCH 1/2] [options] assign -V to --version to resolve conflict with --verbose --- README.md | 2 +- youtube_dl/options.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 01f975958c8..19716168c98 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo # OPTIONS -h, --help Print this help text and exit - --version Print program version and exit + -V, --version Print program version and exit -U, --update Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index 1ffabc62bed..8b19b86fc80 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -134,7 +134,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser): action='help', help='Print this help text and exit') general.add_option( - '-v', '--version', + '-V', '--version', action='version', help='Print program version and exit') general.add_option( From 689d621b407c3b3be8c7a3906c3da8c407f11b9c Mon Sep 17 00:00:00 2001 From: nao20010128nao Date: Fri, 28 Feb 2020 10:06:11 +0000 Subject: [PATCH 2/2] [options] Remove shorthand for --version --- README.md | 2 +- youtube_dl/options.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 19716168c98..01f975958c8 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo # OPTIONS -h, --help Print this help text and exit - -V, --version Print program version and exit + --version Print program version and exit -U, --update Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index 8b19b86fc80..8826b382c3c 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -134,7 +134,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser): action='help', help='Print this help text and exit') general.add_option( - '-V', '--version', + '--version', action='version', help='Print program version and exit') general.add_option(