[options] Add --no-call-home

While we're at it, also drop "experimental" moniker for --call-home - should work fine.

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 84cea472c937e2fa5ad878ab98eb20763b490ded..47e143d895b376714f85ec2312a856bea4867c6f 100755 (executable)
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -213,8 +213,8 @@ class YoutubeDL(object):
                        - "detect_or_warn": check whether we can do anything
                                            about it, warn otherwise
     source_address:    (Experimental) Client-side IP address to bind to.
                        - "detect_or_warn": check whether we can do anything
                                            about it, warn otherwise
     source_address:    (Experimental) Client-side IP address to bind to.

-    call_home:         (Experimental) Boolean, true iff we are allowed to
-                       contact the youtube-dl servers for debugging.
+    call_home:         Boolean, true iff we are allowed to contact the
+                       youtube-dl servers for debugging.

 
 
     The following parameters are not used by YoutubeDL itself, they are used by
 
 
     The following parameters are not used by YoutubeDL itself, they are used by

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 0176bae75b516e076f9924b21568403eea2fb933..a30974efd382511b652397c475371b368f86f85b 100644 (file)
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -508,7 +508,11 @@ def parseOpts(overrideArguments=None):
     verbosity.add_option(
         '-C', '--call-home',
         dest='call_home', action='store_true', default=False,
     verbosity.add_option(
         '-C', '--call-home',
         dest='call_home', action='store_true', default=False,

-        help='Contact the youtube-dl server for debugging. (Experimental)')
+        help='Contact the youtube-dl server for debugging.')
+    verbosity.add_option(
+        '--no-call-home',
+        dest='call_home', action='store_false', default=False,
+        help='Do NOT contact the youtube-dl server for debugging.')

 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
     filesystem.add_option(
 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
     filesystem.add_option(