Attachment #222525 for bug #253582

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

Lines 1-7 Link Here

(-)b/www/youtube_dlc/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= youtube_dlc	3	PORTNAME= youtube_dlc
4	DISTVERSION= 2021.02.09	4	DISTVERSION= 2021.02.15
5	CATEGORIES= www	5	CATEGORIES= www
6		6
7	# Implicit approval to commit trivial version updates.	7	# Implicit approval to commit trivial version updates.
Lines 21-27 MAKE_ARGS= PYTHON=${PYTHON_CMD} Link Here
21	NO_ARCH= yes	21	NO_ARCH= yes
22		22
23	OPTIONS_DEFINE= FFMPEG MANPAGES RTMPDUMP SYMLINK	23	OPTIONS_DEFINE= FFMPEG MANPAGES RTMPDUMP SYMLINK
24	OPTIONS_DEFAULT= RTMPDUMP	24	OPTIONS_DEFAULT= FFMPEG RTMPDUMP
25	OPTIONS_SUB= yes	25	OPTIONS_SUB= yes
26		26
27	RTMPDUMP_DESC= Use rtmpdump to download rtmp video streams	27	RTMPDUMP_DESC= Use rtmpdump to download rtmp video streams

Lines 1-3 Link Here

(-)b/www/youtube_dlc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1612964303	1	TIMESTAMP = 1613562925
2	SHA256 (pukkandan-yt-dlp-2021.02.09_GH0.tar.gz) = 5ed76891ba256b5554bcb7238345d53fcfbf051a1e03747574568011012a5a67	2	SHA256 (pukkandan-yt-dlp-2021.02.15_GH0.tar.gz) = 7b5c89798ddab730c36631e42001873d8d3ecf74803c48faa29149569d09f457
3	SIZE (pukkandan-yt-dlp-2021.02.09_GH0.tar.gz) = 1541519	3	SIZE (pukkandan-yt-dlp-2021.02.15_GH0.tar.gz) = 1547487




--- youtube_dlc/__init__.py.orig	2021-02-17 11:58:10 UTC
+++ youtube_dlc/__init__.py
@@ -38,7 +38,6 @@ from .utils import (
     std_headers,
     write_string,
     render_table,
 )
-from .update import update_self
 from .downloader import (
     FileDownloader,
 )
@@ -555,17 +554,9 @@ def _real_main(argv=None):
         if opts.rm_cachedir:
             ydl.cache.remove()
 
     with YoutubeDL(ydl_opts) as ydl:
-        # Update version
-        if opts.update_self:
-            # If updater returns True, exit. Required for windows
-            if update_self(ydl.to_screen, opts.verbose, ydl._opener):
-                if actual_use:
-                    parser.error('The program must exit for the update to complete')
-                sys.exit()
-
         # Remove cache dir
         if opts.rm_cachedir:
             ydl.cache.remove()
 
         # Maybe do nothing
         if not actual_use:
-            if opts.update_self or opts.rm_cachedir:
+            if opts.rm_cachedir:
                 sys.exit()




--- youtube_dlc/options.py.orig	2021-02-17 12:04:51 UTC
+++ youtube_dlc/options.py
@@ -151,10 +151,6 @@ def parseOpts(overrideArguments=None):
         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', '--no-abort-on-error',
         action='store_true', dest='ignoreerrors', default=True,
         help='Continue on download errors, for example to skip unavailable videos in a playlist (default) (Alias: --no-abort-on-error)')

Return to bug 253582

Lines 1-27 Link Here

(-)b/www/youtube_dlc/files/patch-youtube__dlc_____init____.py (-12 / +12 lines)
1	--- youtube_dlc/__init__.py.orig 2021-01-16 18:54:52 UTC	1	--- youtube_dlc/__init__.py.orig 2021-02-17 11:58:10 UTC
2	+++ youtube_dlc/__init__.py	2	+++ youtube_dlc/__init__.py
3	@@ -39,7 +39,6 @@ from .utils import (	3	@@ -38,7 +38,6 @@ from .utils import (
		4	std_headers,
4	write_string,	5	write_string,
5	render_table,
6	)	6	)
7	-from .update import update_self	7	-from .update import update_self
8	from .downloader import (	8	from .downloader import (
9	FileDownloader,	9	FileDownloader,
10	)	10	)
11	@@ -499,17 +498,13 @@ def _real_main(argv=None):	11	@@ -555,17 +554,9 @@ def _real_main(argv=None):
12	}	12	if opts.rm_cachedir:
		13	ydl.cache.remove()
13		14
14	with YoutubeDL(ydl_opts) as ydl:
15	- # Update version	15	- # Update version
16	- if opts.update_self:	16	- if opts.update_self:
17	- update_self(ydl.to_screen, opts.verbose, ydl._opener)	17	- # If updater returns True, exit. Required for windows
		18	- if update_self(ydl.to_screen, opts.verbose, ydl._opener):
		19	- if actual_use:
		20	- parser.error('The program must exit for the update to complete')
		21	- sys.exit()
18	-	22	-
19	# Remove cache dir
20	if opts.rm_cachedir:
21	ydl.cache.remove()
22
23	# Maybe do nothing	23	# Maybe do nothing
24	if (len(all_urls) < 1) and (opts.load_info_filename is None):	24	if not actual_use:
25	- if opts.update_self or opts.rm_cachedir:	25	- if opts.update_self or opts.rm_cachedir:
26	+ if opts.rm_cachedir:	26	+ if opts.rm_cachedir:
27	sys.exit()	27	sys.exit()

Lines 1-13 Link Here

(-)b/www/youtube_dlc/files/patch-youtube__dlc_options.py (-4 / +4 lines)
1	--- youtube_dlc/options.py.orig 2021-01-17 22:30:37 UTC	1	--- youtube_dlc/options.py.orig 2021-02-17 12:04:51 UTC
2	+++ youtube_dlc/options.py	2	+++ youtube_dlc/options.py
3	@@ -131,10 +131,6 @@ def parseOpts(overrideArguments=None):	3	@@ -151,10 +151,6 @@ def parseOpts(overrideArguments=None):
4	action='version',	4	action='version',
5	help='Print program version and exit')	5	help='Print program version and exit')
6	general.add_option(	6	general.add_option(
7	- '-U', '--update',	7	- '-U', '--update',
8	- action='store_true', dest='update_self',	8	- action='store_true', dest='update_self',
9	- help='[BROKEN] Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')	9	- help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
10	- general.add_option(	10	- general.add_option(
11	'-i', '--ignore-errors', '--no-abort-on-error',	11	'-i', '--ignore-errors', '--no-abort-on-error',
12	action='store_true', dest='ignoreerrors', default=True,	12	action='store_true', dest='ignoreerrors', default=True,
13	help='Continue on download errors, for example to skip unavailable videos in a playlist (default)')	13	help='Continue on download errors, for example to skip unavailable videos in a playlist (default) (Alias: --no-abort-on-error)')