diff options
| author |   Joonas Niilola <juippis@gentoo.org> | 2020-10-22 09:37:21 +0300 |
|---|---|---|
| committer | Joonas Niilola <juippis@gentoo.org> | 2020-10-22 10:15:47 +0300 |
| commit | eae0efb2d9d00f69e79b13d57e190c0fc543b7a4 (patch) | |
| tree | af69e82e04e21879660fc3c2e5947059bcc066d5 /media-video/yle-dl | |
| parent | app-admin/keepassxc: Removed old (diff) | |
| download | gentoo-eae0efb2d9d00f69e79b13d57e190c0fc543b7a4.tar.gz gentoo-eae0efb2d9d00f69e79b13d57e190c0fc543b7a4.tar.bz2 gentoo-eae0efb2d9d00f69e79b13d57e190c0fc543b7a4.zip | |
media-video/yle-dl: reverse shlex.join on 2020-10-19
- shlex.join only works in >=python-3.8 and since our profile stable is still
3.7, the program may crash during runtime on stable users.
Closes: https://bugs.gentoo.org/750536
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-video/yle-dl')
| -rw-r--r-- | media-video/yle-dl/files/yle-dl-20201019-reverse-shlex.join.patch | 20 | ||||
| -rw-r--r-- | media-video/yle-dl/yle-dl-20201019-r1.ebuild (renamed from media-video/yle-dl/yle-dl-20201019.ebuild) | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/media-video/yle-dl/files/yle-dl-20201019-reverse-shlex.join.patch b/media-video/yle-dl/files/yle-dl-20201019-reverse-shlex.join.patch new file mode 100644 index 000000000000..5a8bf95cca76 --- /dev/null +++ b/media-video/yle-dl/files/yle-dl-20201019-reverse-shlex.join.patch @@ -0,0 +1,20 @@ +diff -Naur a/yledl/backends.py b/yledl/backends.py +--- a/yledl/backends.py 2020-10-19 20:08:38.000000000 +0300 ++++ b/yledl/backends.py 2020-10-22 09:28:16.493675080 +0300 +@@ -8,7 +8,6 @@ + import os.path + import platform + import signal +-import shlex + import subprocess + from builtins import str + from .exitcodes import RD_SUCCESS, RD_FAILED, RD_INCOMPLETE, \ +@@ -164,7 +163,7 @@ + return RD_SUCCESS + + logger.debug('Executing:') +- shell_command_string = ' | '.join(shlex.join(args) for args in commands) ++ shell_command_string = ' | '.join(' '.join(args) for args in commands) + logger.debug(shell_command_string) + + env = self.combine_envs(extra_environment) diff --git a/media-video/yle-dl/yle-dl-20201019.ebuild b/media-video/yle-dl/yle-dl-20201019-r1.ebuild index ec87a0a528ea..a4bfbad91bf7 100644 --- a/media-video/yle-dl/yle-dl-20201019.ebuild +++ b/media-video/yle-dl/yle-dl-20201019-r1.ebuild @@ -43,6 +43,8 @@ distutils_enable_tests setup.py DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample ) +PATCHES=( "${FILESDIR}"/${P}-reverse-shlex.join.patch ) + src_install() { docompress -x "/usr/share/doc/${PF}/yledl.conf.sample" distutils-r1_src_install |