schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/vimeo_passworded_videos'

Browse source
This commit is contained in:
Philipp Hagemeister 2013-06-23 19:00:16 +02:00
commit 8756c5fe7a
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
youtube_dl/__init__.py
View file

@ -423,7 +423,7 @@ def _real_main(argv=None):
if opts.usenetrc and (opts.username is not None or opts.password is not None):
parser.error(u'using .netrc conflicts with giving username/password')
if opts.password is not None and opts.username is None:
parser.error(u'account username missing')
print(u'WARNING: account username missing')
if opts.outtmpl is not None and (opts.usetitle or opts.autonumber or opts.useid):
parser.error(u'using output template conflicts with using title, video ID or auto number')
if opts.usetitle and opts.useid: