From patchwork Sun Oct 23 08:24:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew James Kraai X-Patchwork-Id: 44037 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 DF3E127BBEA; Mon, 24 Oct 2022 06:23:57 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 8BE9427BBE9 for ; Mon, 24 Oct 2022 06:23:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oml68-0006Fo-2S for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 20:13:44 -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 1omWI2-0004Il-D2 for guix-patches@gnu.org; Sun, 23 Oct 2022 04:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omWI2-0006Nu-56 for guix-patches@gnu.org; Sun, 23 Oct 2022 04:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omWI1-0000Sn-TB for guix-patches@gnu.org; Sun, 23 Oct 2022 04:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58673] Updated patch References: <20221021032151.26992-1-kraai@ftbfs.org> In-Reply-To: <20221021032151.26992-1-kraai@ftbfs.org> Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Oct 2022 08:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58673 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58673@debbugs.gnu.org Received: via spool by 58673-submit@debbugs.gnu.org id=B58673.16665134771749 (code B ref 58673); Sun, 23 Oct 2022 08:25:01 +0000 Received: (at 58673) by debbugs.gnu.org; 23 Oct 2022 08:24:37 +0000 Received: from localhost ([127.0.0.1]:42824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omWHc-0000S9-OP for submit@debbugs.gnu.org; Sun, 23 Oct 2022 04:24:36 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:42156 helo=aws.ftbfs.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omWHZ-0000Ru-3v for 58673@debbugs.gnu.org; Sun, 23 Oct 2022 04:24:35 -0400 Received: from ip68-4-255-43.oc.oc.cox.net ([68.4.255.43] helo=carlo) by aws.ftbfs.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1omWHS-0009Uw-Pi for 58673@debbugs.gnu.org; Sun, 23 Oct 2022 08:24:27 +0000 Date: Sun, 23 Oct 2022 01:24:25 -0700 From: Matthew James Kraai Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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" X-getmail-retrieved-from-mailbox: Patches From 139a7cfe0398bb4bbe904ec58887f681de177657 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Thu, 20 Oct 2022 20:16:00 -0700 Subject: [PATCH] gnu: s3cmd: Fix program name in output. * gnu/packages/python-xyz.scm (s3cmd)[arguments]: Add a new 'hide-wrapping phase. --- gnu/packages/python-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) Here's an updated patch that also fixes the command name in messages displayed by s3cmd. diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 32bd986a12..e795fa1838 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16222,6 +16222,15 @@ (define-public s3cmd (sha256 (base32 "0rdgwwmmp8mdxc84bxq6k9a7v7z2qgc3df47djzs2b84gw81dglx")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'hide-wrapping + (lambda _ + (substitute* "S3/MultiPart.py" + (("sys\\.argv\\[0\\]") "\"s3cmd\"")) + (substitute* "s3cmd" + (("optparser\\.get_prog_name\\(\\)") "\"s3cmd\""))))))) (inputs (list python-dateutil python-magic))