all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Matthew James Kraai <kraai@ftbfs.org>
To: 58673@debbugs.gnu.org
Subject: [bug#58673] Updated patch
Date: Sun, 23 Oct 2022 01:24:25 -0700	[thread overview]
Message-ID: <Y1T6Of/gFZ2yvL6d@carlo> (raw)
In-Reply-To: <20221021032151.26992-1-kraai@ftbfs.org>

From 139a7cfe0398bb4bbe904ec58887f681de177657 Mon Sep 17 00:00:00 2001
From: Matthew James Kraai <kraai@ftbfs.org>
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))
-- 
2.38.0




  reply	other threads:[~2022-10-24  1:53 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-21  3:21 [bug#58673] [PATCH] gnu: s3cmd: Fix program name in --help output Matthew James Kraai
2022-10-23  8:24 ` Matthew James Kraai [this message]
2022-11-18 13:52   ` bug#58673: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y1T6Of/gFZ2yvL6d@carlo \
    --to=kraai@ftbfs.org \
    --cc=58673@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.