From patchwork Fri Oct 21 03:21:51 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: 43746 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 D1D1827BBED; Fri, 21 Oct 2022 04:23:40 +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 autolearn=ham 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 B3E8B27BBE9 for ; Fri, 21 Oct 2022 04:23:39 +0100 (BST) Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olidG-0008Uy-Dq for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 23:23:38 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olicm-0007V2-Fu for patchwork@mira.cbaines.net; 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Oct 2022 03:23:02 +0000 Resent-Message-ID: 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 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 ) 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 ) 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 ) 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 ) 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 ) id 1olibZ-0001bW-UD; Fri, 21 Oct 2022 03:21:54 +0000 From: Matthew James Kraai 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 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: 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 * 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))