From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Sun, 26 Oct 2014 12:01:57 +0000 (+0100)
Subject: Set '--simulate' if any of the printing options is given (fixes #3036)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=1bdeb7be2e5bef703d54d8786fbc6f3c0c23faef

Set '--simulate' if any of the printing options is given (fixes #3036)

That's what the help messages say.
Previously it would only set '--skip-download', which would write thumbnail,
descriptions or subtitles if they were requested (for example you may have set
'--write-thumbnail' in the config file).
---

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 4f5ce604f..578ecc4ab 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -307,8 +307,8 @@ def _real_main(argv=None):
         'forceformat': opts.getformat,
         'forcejson': opts.dumpjson,
         'dump_single_json': opts.dump_single_json,
-        'simulate': opts.simulate,
-        'skip_download': (opts.skip_download or opts.simulate or any_printing),
+        'simulate': opts.simulate or any_printing,
+        'skip_download': opts.skip_download,
         'format': opts.format,
         'format_limit': opts.format_limit,
         'listformats': opts.listformats,