Attachment #149804 for bug #195353

View | Details | Raw Unified | Return to bug 195353
Collapse All | Expand All

Lines 1-7 Link Here

(-)www/youtube_dl/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= youtube_dl	3	PORTNAME= youtube_dl
4	PORTVERSION= 2014.09.29.2	4	PORTVERSION= 2014.11.24
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/	6	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/
7	DISTNAME= youtube-dl-${PORTVERSION}	7	DISTNAME= youtube-dl-${PORTVERSION}

Lines 1-2 Link Here

(-)www/youtube_dl/distinfo (-2 / +2 lines)
1	SHA256 (youtube-dl-2014.09.29.2.tar.gz) = 4192ad648e21e8ab1a4e9b4fe130e47623834407737fd40a0197c61fe38b50f1	1	SHA256 (youtube-dl-2014.11.24.tar.gz) = 3bae2155e429c3409bfac431330a86c931ea36d87c4c07e793bf0ea0cbfc1cbf
2	SIZE (youtube-dl-2014.09.29.2.tar.gz) = 1072137	2	SIZE (youtube-dl-2014.11.24.tar.gz) = 1149666




--- youtube_dl/__init__.py.orig	2014-11-23 17:50:21.000000000 +0800
+++ youtube_dl/__init__.py	2014-11-23 21:17:37.918929006 +0800
@@ -34,7 +34,6 @@
     std_headers,
     write_string,
 )

 from .downloader import (
     FileDownloader,
 )
@@ -324,17 +323,13 @@
             ydl.add_post_processor(ExecAfterDownloadPP(
                 verboseOutput=opts.verbose, exec_cmd=opts.exec_cmd))
 

 
         # Maybe do nothing
         if (len(all_urls) < 1) and (opts.load_info_filename is None):
-            if opts.update_self or opts.rm_cachedir:
+            if opts.rm_cachedir:
                 parser.error(u'you must provide at least one URL')
             else:
                 sys.exit()
 
             ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)




--- youtube_dl/options.py.orig	2014-11-15 22:16:23.000000000 +0800
+++ youtube_dl/options.py	2014-11-22 12:34:15.188052389 +0800
@@ -125,10 +125,6 @@
         action='version',
         help='print program version and exit')
     general.add_option(
-        '-U', '--update',
-        action='store_true', dest='update_self',
-        help='update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
-    general.add_option(
         '-i', '--ignore-errors',
         action='store_true', dest='ignoreerrors', default=False,
         help='continue on download errors, for example to skip unavailable videos in a playlist')

Return to bug 195353

Lines 1-6 Link Here

(-)www/youtube_dl/files/patch-youtube_dl____init__.py (-8 / +8 lines)
1	--- youtube_dl/__init__.py.orig 2014-09-27 21:51:19 UTC	1	--- youtube_dl/__init__.py.orig 2014-11-23 17:50:21.000000000 +0800
2	+++ youtube_dl/__init__.py	2	+++ youtube_dl/__init__.py 2014-11-23 21:17:37.918929006 +0800
3	@@ -108,7 +108,6 @@	3	@@ -34,7 +34,6 @@
4	std_headers,	4	std_headers,
5	write_string,	5	write_string,
6	)	6	)
Lines 8-14 Link Here
8	from .downloader import (	8	from .downloader import (
9	FileDownloader,	9	FileDownloader,
10	)	10	)
11	@@ -399,17 +398,13 @@	11	@@ -324,17 +323,13 @@
12	ydl.add_post_processor(ExecAfterDownloadPP(	12	ydl.add_post_processor(ExecAfterDownloadPP(
13	verboseOutput=opts.verbose, exec_cmd=opts.exec_cmd))	13	verboseOutput=opts.verbose, exec_cmd=opts.exec_cmd))
14		14
Lines 22-29 Link Here
22		22
23	# Maybe do nothing	23	# Maybe do nothing
24	if (len(all_urls) < 1) and (opts.load_info_filename is None):	24	if (len(all_urls) < 1) and (opts.load_info_filename is None):
25	- if not (opts.update_self or opts.rm_cachedir):	25	- if opts.update_self or opts.rm_cachedir:
26	+ if not (opts.rm_cachedir):	26	+ if opts.rm_cachedir:
27	parser.error(u'you must provide at least one URL')
28	else:
29	sys.exit()	27	sys.exit()
		28
		29	ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)

Lines 1-11 Link Here

(-)www/youtube_dl/files/patch-youtube_dl__options.py (-11 / +13 lines)
1	--- youtube_dl/options.py.orig 2014-10-01 13:10:09 UTC	1	--- youtube_dl/options.py.orig 2014-11-15 22:16:23.000000000 +0800
2	+++ youtube_dl/options.py	2	+++ youtube_dl/options.py 2014-11-22 12:34:15.188052389 +0800
3	@@ -127,8 +127,6 @@	3	@@ -125,10 +125,6 @@
4	action='help', help='print this help text and exit')	4	action='version',
5	general.add_option('-v', '--version',	5	help='print program version and exit')
6	action='version', help='print program version and exit')	6	general.add_option(
7	- general.add_option('-U', '--update',	7	- '-U', '--update',
8	- action='store_true', dest='update_self', help='update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')	8	- action='store_true', dest='update_self',
9	general.add_option('-i', '--ignore-errors',	9	- help='update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
10	action='store_true', dest='ignoreerrors', help='continue on download errors, for example to skip unavailable videos in a playlist', default=False)	10	- general.add_option(
11	general.add_option('--abort-on-error',	11	'-i', '--ignore-errors',
		12	action='store_true', dest='ignoreerrors', default=False,
		13	help='continue on download errors, for example to skip unavailable videos in a playlist')