X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=dfa4ae839055621ab48b89527dbd50eb0c61c06f;hb=4201ba13e674788c36ae69fbfbffc4b246717d6a;hp=ae8b836943b7f8c183f4d3cb5d9fedb89ce5c0e7;hpb=d7553968047d1fe8221905ea6ce7c006881ec2e3;p=youtube-dl

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index ae8b83694..dfa4ae839 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -95,7 +95,7 @@ def _real_main(argv=None):
                 write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
         except IOError:
             sys.exit('ERROR: batch file could not be read')
-    all_urls = batch_urls + [url.strip() for url in args]
+    all_urls = batch_urls + [url.strip() for url in args]  # batch_urls are already striped in read_batch_urls
     _enc = preferredencoding()
     all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls]
 
@@ -405,7 +405,7 @@ def _real_main(argv=None):
         'postprocessor_args': postprocessor_args,
         'cn_verification_proxy': opts.cn_verification_proxy,
         'geo_verification_proxy': opts.geo_verification_proxy,
-
+        'config_location': opts.config_location,
     }
 
     with YoutubeDL(ydl_opts) as ydl:
@@ -449,4 +449,5 @@ def main(argv=None):
     except KeyboardInterrupt:
         sys.exit('\nERROR: Interrupted by user')
 
+
 __all__ = ['main', 'YoutubeDL', 'gen_extractors', 'list_extractors']