projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vevo] Allow video info to fail in tests
[youtube-dl]
/
youtube_dl
/
options.py
diff --git
a/youtube_dl/options.py
b/youtube_dl/options.py
index b2e863119494b06ed9f8d93d2efece56811093c5..53497fbc6f60a945b6350ce36e352a8eb6ef1f2c 100644
(file)
--- a/
youtube_dl/options.py
+++ b/
youtube_dl/options.py
@@
-355,19
+355,19
@@
def parseOpts(overrideArguments=None):
adobe_pass.add_option(
'--ap-mso',
dest='ap_mso', metavar='MSO',
adobe_pass.add_option(
'--ap-mso',
dest='ap_mso', metavar='MSO',
- help='Adobe Pass
Multiple-system operator Identifier
')
+ help='Adobe Pass
multiple-system operator (TV provider) identifier, use --ap-list-mso for a list of available MSOs
')
adobe_pass.add_option(
'--ap-username',
dest='ap_username', metavar='USERNAME',
adobe_pass.add_option(
'--ap-username',
dest='ap_username', metavar='USERNAME',
- help='
TV Provider Login with this account ID
')
+ help='
Multiple-system operator account login
')
adobe_pass.add_option(
'--ap-password',
dest='ap_password', metavar='PASSWORD',
adobe_pass.add_option(
'--ap-password',
dest='ap_password', metavar='PASSWORD',
- help='
TV Provider A
ccount password. If this option is left out, youtube-dl will ask interactively.')
+ help='
Multiple-system operator a
ccount password. If this option is left out, youtube-dl will ask interactively.')
adobe_pass.add_option(
'--ap-list-mso',
action='store_true', dest='ap_list_mso', default=False,
adobe_pass.add_option(
'--ap-list-mso',
action='store_true', dest='ap_list_mso', default=False,
- help='List all supported
TV Provide
rs')
+ help='List all supported
multiple-system operato
rs')
video_format = optparse.OptionGroup(parser, 'Video Format Options')
video_format.add_option(
video_format = optparse.OptionGroup(parser, 'Video Format Options')
video_format.add_option(
@@
-831,6
+831,7
@@
def parseOpts(overrideArguments=None):
parser.add_option_group(video_format)
parser.add_option_group(subtitles)
parser.add_option_group(authentication)
parser.add_option_group(video_format)
parser.add_option_group(subtitles)
parser.add_option_group(authentication)
+ parser.add_option_group(adobe_pass)
parser.add_option_group(postproc)
if overrideArguments is not None:
parser.add_option_group(postproc)
if overrideArguments is not None: