From 900dcc34dcda0cbc21d152fb9011907a632c0e31 Mon Sep 17 00:00:00 2001 From: PPed72 Date: Mon, 21 Mar 2016 10:58:31 +0100 Subject: net-p2p/deluge: fix scheduler plugin Reporter: Giacomo Tazzari Gentoo-Bug: https://bugs.gentoo.org/577848 Closes: https://github.com/gentoo/gentoo/pull/1103 --- net-p2p/deluge/deluge-1.3.12-r3.ebuild | 1 + .../files/deluge-1.3.12-fix_scheduler_plugin.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch (limited to 'net-p2p/deluge') diff --git a/net-p2p/deluge/deluge-1.3.12-r3.ebuild b/net-p2p/deluge/deluge-1.3.12-r3.ebuild index cd671e152f01..1327cd2d56f4 100644 --- a/net-p2p/deluge/deluge-1.3.12-r3.ebuild +++ b/net-p2p/deluge/deluge-1.3.12-r3.ebuild @@ -50,6 +50,7 @@ RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python] python_prepare_all() { local PATCHES=( "${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch + "${FILESDIR}"/${PN}-1.3.12-fix_scheduler_plugin.patch ) distutils-r1_python_prepare_all diff --git a/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch b/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch new file mode 100644 index 000000000000..fda64aa2b393 --- /dev/null +++ b/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch @@ -0,0 +1,22 @@ +From cdf301601fe71bd697f3796cf0a5656d437d140e Mon Sep 17 00:00:00 2001 +From: Calum Lind +Date: Wed, 16 Sep 2015 15:11:56 +0100 +Subject: [Scheduler] Revert erroneous fix backported from develop branch + + * The issue this was intended to fix only occurs on develop branch +--- + deluge/plugins/scheduler/scheduler/core.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deluge/plugins/scheduler/scheduler/core.py b/deluge/plugins/scheduler/scheduler/core.py +index 9fb81df..f0e2392 100644 +--- a/deluge/plugins/scheduler/scheduler/core.py ++++ b/deluge/plugins/scheduler/scheduler/core.py +@@ -127,7 +127,7 @@ class Core(CorePluginBase): + """ + core_config = deluge.configmanager.ConfigManager("core.conf") + for setting in CONTROLLED_SETTINGS: +- component.get("PreferencesManager").do_config_set_func(setting, core_config[setting]) ++ core_config.apply_set_functions(setting) + # Resume the session if necessary + component.get("Core").session.resume() -- cgit v1.2.3