From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp10.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms5.migadu.com with LMTPS
	id 6O6HHrcQUmPvWAEAbAwnHQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Fri, 21 Oct 2022 05:23:35 +0200
Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp10.migadu.com with LMTPS
	id COiwHbcQUmP66AAAG6o9tA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Fri, 21 Oct 2022 05:23:35 +0200
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 1909316964
	for <larch@yhetil.org>; Fri, 21 Oct 2022 05:23:35 +0200 (CEST)
Received: from localhost ([::1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1olidC-0008Ic-8Y
	for larch@yhetil.org; Thu, 20 Oct 2022 23:23:34 -0400
Received: from [::1] (helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1olicm-0007V2-9b
	for larch@yhetil.org; Thu, 20 Oct 2022 23:23:08 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1olicg-0007Tj-NT
 for guix-patches@gnu.org; Thu, 20 Oct 2022 23:23:04 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1olicg-0005iX-AQ
 for guix-patches@gnu.org; Thu, 20 Oct 2022 23:23:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1olicg-0007G9-5H
 for guix-patches@gnu.org; Thu, 20 Oct 2022 23:23:02 -0400
X-Loop: help-debbugs@gnu.org
Subject: [bug#58673] [PATCH] gnu: s3cmd: Fix program name in --help output.
Resent-From: Matthew James Kraai <kraai@ftbfs.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Fri, 21 Oct 2022 03:23:02 +0000
Resent-Message-ID: <handler.58673.B.166632252427811@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 58673
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58673@debbugs.gnu.org
Cc: Matthew James Kraai <kraai@ftbfs.org>
X-Debbugs-Original-To: guix-patches@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.166632252427811
 (code B ref -1); Fri, 21 Oct 2022 03:23:02 +0000
Received: (at submit) by debbugs.gnu.org; 21 Oct 2022 03:22:04 +0000
Received: from localhost ([127.0.0.1]:36542 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1olibk-0007EU-1s
 for submit@debbugs.gnu.org; Thu, 20 Oct 2022 23:22:04 -0400
Received: from lists.gnu.org ([209.51.188.17]:43544)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <kraai@ftbfs.org>) id 1olibi-0007EL-F9
 for submit@debbugs.gnu.org; Thu, 20 Oct 2022 23:22:02 -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 <kraai@ftbfs.org>) id 1olibg-0005h0-Ph
 for guix-patches@gnu.org; Thu, 20 Oct 2022 23:22:00 -0400
Received: from mail.ftbfs.org ([52.8.68.13] helo=aws.ftbfs.org)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <kraai@ftbfs.org>) id 1olibd-0005cr-OI
 for guix-patches@gnu.org; Thu, 20 Oct 2022 23:22:00 -0400
Received: from ip68-4-255-43.oc.oc.cox.net ([68.4.255.43] helo=carlo.lan)
 by aws.ftbfs.org with esmtpsa (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2)
 (envelope-from <kraai@ftbfs.org>)
 id 1olibZ-0001bW-UD; Fri, 21 Oct 2022 03:21:54 +0000
From: Matthew James Kraai <kraai@ftbfs.org>
Date: Thu, 20 Oct 2022 20:21:51 -0700
Message-Id: <20221021032151.26992-1-kraai@ftbfs.org>
X-Mailer: git-send-email 2.38.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org;
 helo=aws.ftbfs.org
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+larch=yhetil.org@gnu.org>
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1666322615;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=9FWRhfowM+8nzaUTV14+gE6vKQzYpRreB300rpwmWfI=;
	b=pwzktvgpYCYBBzGdyyvZY2FoqPVM9T7+iwP1FFwaLcBF8pMBgysG4tQIv4TLvO1pbE1PQn
	DNAY8GxqsGuXKFb27zG8SHoEniTajVVXev9mJ51GxwY928hNHcl2gvgHHZlel1k73ARapk
	TfEDkzioEU/0jWgxdDih91T1JWpkkWIMWd0roKJ2pUAM5uXmPrDFp3lZRCPMit2AlIJ89v
	l8W0cVqXu+HidJ/6fyEBgjE47Ju55XpdT2AWTZzUog5PZlhH41qLGP/921kGzXnjeqFtfy
	ZuyTH/PWEdzlcHGuj934TrR1hKgrT8Ckd9Qz6OkQD5LlW9IxPF77oYn7nZmY0g==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666322615; a=rsa-sha256; cv=none;
	b=oCWIzk6fUQeSKmyiUzPxOQPjZIPw2Z/ZXvRTOSPfvRKOeEYQNq3cdkwv/49h8n62caqygb
	JQYPsBwHvY4Od0AyOSvoLV/wE3mnuQ2z1oKfA5T/ihuuBX6i+QyUahceg3d4QyNvADObbU
	XB/iNENbMQkvGtRYXvnB2r/cd+63FdcODOgpdXLAOzVtYMa2mhWOj98Kotp6jM4nimqSpw
	jnO56yq7e6ZxsRsPpfb24nsDvz7VleWx5PkkUMytcJNNUWs/nonQyY/JfjALxtnFfH+mmS
	d4xShWfy9BYTZIHRteS83RE+zs6fLDkO+JoX+2Uh0aDT938b3/bxiVcB2oArVw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=none;
	dmarc=none;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
X-Migadu-Spam-Score: -2.14
Authentication-Results: aspmx1.migadu.com;
	dkim=none;
	dmarc=none;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
X-Migadu-Queue-Id: 1909316964
X-Spam-Score: -2.14
X-Migadu-Scanner: scn0.migadu.com
X-TUID: Gpp980/7UcKm

* gnu/packages/python-xyz.scm (s3cmd)[arguments]: Add a new 'hide-wrapping
phase.
---
 gnu/packages/python-xyz.scm | 7 +++++++
 1 file changed, 7 insertions(+)

The Commands section of `s3cmd --help`'s output displays `.s3cmd-real` instead
of `s3cmd` in the commands (e.g., `.s3cmd-real mb s3://BUCKET`).  This makes
it display `s3cmd` instead (e.g., `s3cmd mb s3://BUCKET`).

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 32bd986a12..81fa89fec2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16222,6 +16222,13 @@ (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* "s3cmd"
+                     (("optparser\\.get_prog_name\\(\\)") "\"s3cmd\"")))))))
     (inputs
      (list python-dateutil
            python-magic))
-- 
2.38.0