From patchwork Sun Mar 30 21:22:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 41040 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 81C8327BBE2; Sun, 30 Mar 2025 22:23:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2A33027BBE9 for ; Sun, 30 Mar 2025 22:23:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tz07X-0003CL-Dj; Sun, 30 Mar 2025 17:23:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tz07T-0003CC-5s for guix-patches@gnu.org; Sun, 30 Mar 2025 17:23:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tz07S-0001ez-SF for guix-patches@gnu.org; Sun, 30 Mar 2025 17:23:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=NrIzVxmHkcMxKxh1CN9ZHd+wjcr+YIPkM582Ds2FXxI=; b=b6lS+M0mo70NGjsk5bNrmjjBPaCTDI0GjXJEk8a5u2p5de5/L3DjmVcuGC2F0i7cZxzr2f0ryQjm6Sz8emO8/FPv5EucBT6Vh4zgWarj4lGXxKiB2AEJXadDdb0pZ7jSmVhwFvfXi4VBX5Tn6UIRZQ1ggSvQWSkwC1gQ6rrdVrdNeJ4FtrzqcA5QZgG6f8vjdmhKRNjMP699jeJluaVLBjTItjuiTmu7LtR4AmDZDDBynKuRhzuU0lRBjLAJHf+iL8wd4ZPqZhYTf8A+5cK/zRtgZ6cNCPuINRj1ZTr3gfiIbsULotwgSnCfj6ozZfBuawBQ2WoRdfNtjxH7KlnDlg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tz07S-0005Dv-Ee for guix-patches@gnu.org; Sun, 30 Mar 2025 17:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77393] [PATCH] gnu: deluge: Backport fix for deluge-console. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Mar 2025 21:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77393@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174336978020061 (code B ref -1); Sun, 30 Mar 2025 21:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2025 21:23:00 +0000 Received: from localhost ([127.0.0.1]:38268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tz07P-0005DQ-No for submit@debbugs.gnu.org; Sun, 30 Mar 2025 17:23:00 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45576) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tz07M-0005Cu-Cx for submit@debbugs.gnu.org; Sun, 30 Mar 2025 17:22:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tz07F-0003BF-OY for guix-patches@gnu.org; Sun, 30 Mar 2025 17:22:49 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tz07C-0001ef-AI for guix-patches@gnu.org; Sun, 30 Mar 2025 17:22:48 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 621ED31C511; Sun, 30 Mar 2025 21:22:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743369763; bh=Iu4rurFcl73P2y4XCoF8GnAmex117apk3FyiRCuZkgM=; h=From:To:Cc:Subject:Date; b=D8um9iFWFtKQ4vlRiXdGupTPP/OWF2b1Jax6OQBTHmNseKhJiPEf+/msurYOPlKBi a5Tq3BCwsoIHZDodK0SMjHPjg2L/okuZJeb3bwQeuiOCxFPnWizLgncacURPWz2C9l EwILdfqP+3GlEt5mEuXT7aTlNL0bMfzoKisR5xqan9cX7rBueO5t2AryxcmE/3tnW6 5Cx/26ibMZzSweQqPCJNY/iZ5QqCVOxwW4N4Aa7d7Hr6LRwJyznDvmYdlQwA2Ze+N7 GpeaQcYRe7PYrl4YzhAdwSQ35gcxo7u0ayAqFfqm+sTlaokKbtzb8LP9/HNEKgiqpJ vNnEdEtb6z8xweVAoZDVYLDB2UUYpJ8xVWgw+0e+tgFoVusRbLa0ilYZCC9mQEfzbS khOEwblLF4urI5mimlHkmrRzZOYYN9TBcmRKgFHct4Oxx4mAnvjlhxNSJ3R8DI/c9q Om8jBq8BRp/7Xp2EL4PbEKvgese1BanVuIKkghf2bmUMouHcQ0hl45uumEyPkkUPoX tYaEb/IM6lHSFK/ohmRhS8NelAqiXTqmHa/159twbpHGN2TKW+kdFxuHaVQH+1IIWh 6eWQlLnLgG1kKb3Y7BB24Os/JjHc6kizancxSEKUTqKsZv1P/yx/7+9LdMnKpwJNEb s5/93zcNkyNhQuXABSmIt66o= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 8CEF931A3F6; Sun, 30 Mar 2025 21:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743369762; bh=Iu4rurFcl73P2y4XCoF8GnAmex117apk3FyiRCuZkgM=; h=From:To:Cc:Subject:Date; b=eocEJOV3NQ79mjUlEFskQYVQN7oCw22MbzLbcI1rIYQkvqqrmyf32o6LASr6/MKT9 tVNAK2OotwbkN4SANY3TWerk/eYQUQ4sh+pIQaZDD03dwdfk1RG+ixfbs7hW2Nd9fK EdxCRRWh5FPO9IcSfTa0NIpv+popjdP7v1xipI8qgm9NHiEfQ6hVaKWWZ15+eXv15s WX+3ueMSG5O0OLmQ/QvtSvuw11ftz/1j7+Jn7CNZ4H6BuG0ZH2ebarZqYFKS/s56ka g9dXBVtHmim26F1YeR4WLX4gV6r0yEpSZ5iiDtRLNMqxlzfkxSsqNNrilrLXfTNVM5 xORrV3E/X6mS5XwvbjlxHbQH94R047X4oVqhtlCuJhqOYOAN2gtMq5YACGdaT3d0NE oQU6iXK4biSpVnWwNy1c3/zDnJBZfqCY8CDZjBVl3e1Dn9mOHMIbxzYzbvz4MCACxX dNRpS9Adz2kTju0LpPFs2xF897a594SfwtNaqcIowZ7O3EjjjWuHrV7+pT6vaDBouI hWdfjVy5O8EEEXkQdsQYO8TP9XT2qaFhPpETP6zTPo0UbL4KLH7OMpkWTelAxyTnC+ uSjfTd1LvCjL90ENPJYdcmFcLgFksMryGV5jUrkbf5u9/EJ5FIRexoYa2UfOuurTwg rt/bL69lQd2MHBQmTTC0wxEE= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 30 Mar 2025 23:22:13 +0200 Message-ID: <3831c8bf5bc7ad63ab86c00baab73661ef975653.1743369732.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Without this fix, the command is not usable from scripting, since it always fails to report the result with: Upstream already has a fix, and it will be present in 2.1.2, so let us backport it for now. * gnu/packages/bittorrent.scm (deluge)[arguments]<#:phases>: Add 'fix-deluge-console. Change-Id: Ifdbcb541aeefbc727890cec2356d346c7fa1dd5d --- I am not sure whether we usually backport fixes, but I needed this to get deluge-console working for me, so I might as well send it. Feel free to close if it goes against some policy. gnu/packages/bittorrent.scm | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.48.1 diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e946660ab7..05bea4c533 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Clément Lassieur ;;; Copyright © 2024 Noisytoot ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -628,6 +629,12 @@ (define-public deluge `(#:tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-deluge-console + (lambda _ + ;; Backport patch for: https://dev.deluge-torrent.org/ticket/3582 + (substitute* "deluge/ui/console/__init__.py" + ((" return Console\\(\\).start\\(\\)") + " Console().start()")))) (add-after 'install 'wrap (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))