GNU logs - #66704, boring messages

Message sent to maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#66704] [PATCH 0/1] patman depends on Git
Resent-From: Simon Tournier <zimon.toutoune@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: maxim.cournoyer@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 23 Oct 2023 16:09:02 +0000
Resent-Message-ID: <handler.66704.B.16980773349524 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 66704 <at> debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@HIDDEN>, maxim.cournoyer@HIDDEN
From: Simon Tournier <zimon.toutoune@HIDDEN>
Date: Mon, 23 Oct 2023 18:07:56 +0200
Message-Id: <cover.1698076987.git.zimon.toutoune@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::331;
 envelope-from=zimon.toutoune@HIDDEN; helo=mail-wm1-x331.google.com
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, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)

Hi,

Assume, I am running in some Git repository, e.g.,

  $ git config --get branch.tmp.remote
  origin

Then, I get this error:

--8<---------------cut here---------------start------------->8---
$ guix shell -C patman -- patman -h
Traceback (most recent call last):
  File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2023.07.02/lib/python3.10/site-packages/u_boot_pylib/command.py", line 95, in run_pipe
    last_pipe = cros_subprocess.Popen(cmd, cwd=cwd, **kwargs)
  File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2023.07.02/lib/python3.10/site-packages/u_boot_pylib/cros_subprocess.py", line 83, in __init__
    super(Popen, self).__init__(args, stdin=stdin,
  File "/gnu/store/p4x29pa0qjb3r76v2bl0jvhld42l0lkq-python-3.10.7/lib/python3.10/subprocess.py", line 969, in __init__
    self._execute_child(args, executable, preexec_fn, close_fds,
  File "/gnu/store/p4x29pa0qjb3r76v2bl0jvhld42l0lkq-python-3.10.7/lib/python3.10/subprocess.py", line 1845, in _execute_child
    raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: 'git'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/gnu/store/znq8klrhn3wwgfvrq0kqm8krx5xi7fpq-patman-2023.07.02/bin/.patman-real", line 47, in <module>
    parser.add_argument('-p', '--project', default=project.detect_project(),
  File "/gnu/store/znq8klrhn3wwgfvrq0kqm8krx5xi7fpq-patman-2023.07.02/lib/python3.10/site-packages/patman/project.py", line 19, in detect_project
    top_level = gitutil.get_top_level()
  File "/gnu/store/znq8klrhn3wwgfvrq0kqm8krx5xi7fpq-patman-2023.07.02/lib/python3.10/site-packages/patman/gitutil.py", line 627, in get_top_level
    return command.output_one_line('git', 'rev-parse', '--show-toplevel')
  File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2023.07.02/lib/python3.10/site-packages/u_boot_pylib/command.py", line 128, in output_one_line
    result = run_pipe([cmd], capture=True, oneline=True,
  File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2023.07.02/lib/python3.10/site-packages/u_boot_pylib/command.py", line 99, in run_pipe
    raise Exception("Error running '%s': %s" % (user_pipestr, str))
Exception: Error running 'git rev-parse --show-toplevel': <class 'str'>
--8<---------------cut here---------------end--------------->8---

That’s because ’patman’ runs ’git’ via the file gitutils.py, see:

--8<---------------cut here---------------start------------->8---
-*- mode:grep; default-directory: "/tmp/u-boot-2023.07.02/tools/patman/" -*-

20 candidates:
./gitutil.py:29:    cmd = ['git']
./gitutil.py:87:    pipe = ['git', 'name-rev', commit_hash]
./gitutil.py:139:        remote = command.output_one_line('git', '--git-dir', git_dir, 'config',
./gitutil.py:141:        merge = command.output_one_line('git', '--git-dir', git_dir, 'config',
./gitutil.py:231:    pipe = ['git']
./gitutil.py:252:    pipe = ['git', 'clone', git_dir, '.']
./gitutil.py:265:    pipe = ['git']
./gitutil.py:285:    pipe = ['git', '--git-dir', git_dir, 'worktree', 'list']
./gitutil.py:300:    pipe = ['git', '--git-dir', git_dir, 'worktree', 'add', '.', '--detach']
./gitutil.py:315:    pipe = ['git', '--git-dir', git_dir, 'worktree', 'prune']
./gitutil.py:337:    cmd = ['git', 'format-patch', '-M']
./gitutil.py:414:        'git', 'config', 'sendemail.suppresscc', raise_on_error=False)
./gitutil.py:496:        git_config_to = command.output('git', 'config', 'sendemail.to',
./gitutil.py:511:    cmd = ['git', 'send-email', '--annotate']
./gitutil.py:627:    return command.output_one_line('git', 'rev-parse', '--show-toplevel')
./gitutil.py:636:    fname = command.output_one_line('git', 'config', 'sendemail.aliasesfile',
./gitutil.py:654:    uname = command.output_one_line('git', 'config', '--global', 'user.name')
./gitutil.py:664:    uemail = command.output_one_line('git', 'config', '--global', 'user.email')
./gitutil.py:675:        'git', 'config', 'format.subjectprefix', raise_on_error=False)
./gitutil.py:699:    return command.output_one_line('git', 'show', '-s', '--pretty=format:%H')
--8<---------------cut here---------------end--------------->8---

I propose to wrap ’patman’ with ’git’, see patch.

WDYT?

Cheers,
simon


Simon Tournier (1):
  gnu: patman: Wrap program with git.

 gnu/packages/bootloaders.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)


base-commit: a25a492f2b8604de4ebc21298f24891a1a245161
-- 
2.38.1

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: bug#66704: Acknowledgement ([PATCH 0/1] patman depends on Git)
Message-ID: <handler.66704.B.16980773349524.ack <at> debbugs.gnu.org>
References: <cover.1698076987.git.zimon.toutoune@HIDDEN>
X-Gnu-PR-Message: ack 66704
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 66704 <at> debbugs.gnu.org
Date: Mon, 23 Oct 2023 16:09:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

As you requested using X-Debbugs-CC, your message was also forwarded to
  maxim.cournoyer@HIDDEN
(after having been given a bug report number, if it did not have one).

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 66704 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
66704: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66704
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#66704] [PATCH 1/1] gnu: patman: Wrap program with git.
Resent-From: Simon Tournier <zimon.toutoune@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 23 Oct 2023 16:27:02 +0000
Resent-Message-ID: <handler.66704.B66704.169807840711186 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 66704 <at> debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@HIDDEN>
From: Simon Tournier <zimon.toutoune@HIDDEN>
Date: Mon, 23 Oct 2023 18:26:00 +0200
Message-Id: <377171f13a5d00cc460c394a6e0226f6cdcf217a.1698076987.git.zimon.toutoune@HIDDEN>
In-Reply-To: <cover.1698076987.git.zimon.toutoune@HIDDEN>
References: <cover.1698076987.git.zimon.toutoune@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/packages/bootloaders.scm (patman): Replace by 'package/inherit'.
[arguments]: Add 'wrap-program' that uses git-minimal dependency.
[inputs]: Add git-minimal.

Change-Id: Id4ebadd518f271baa087161b10455ec03d6f959b
---
 gnu/packages/bootloaders.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index fb20ba0efa..cdc26a0c9e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -18,6 +18,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
 ;;; Copyright © 2021 Stefan <stefan-guix@HIDDEN>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,7 @@ (define-module (gnu packages bootloaders)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages python-web)
@@ -864,8 +866,7 @@ (define-public python-u-boot-pylib
 ;;; This is packaged separately, as it can be used in other contexts than for
 ;;; U-Boot development.
 (define-public patman
-  (package
-    (inherit u-boot)
+  (package/inherit u-boot
     (name "patman")
     (build-system pyproject-build-system)
     (arguments
@@ -890,8 +891,17 @@ (define-public patman
             (lambda _
               (substitute* "pyproject.toml"
                 (("patman.__main__:run_patman")
-                 "patman.__main__")))))))
-    (inputs (list python-pygit2 python-requests python-u-boot-pylib))
+                 "patman.__main__"))))
+          (add-after 'install 'wrap-program
+            (lambda _
+              (wrap-program (string-append #$output "/bin/patman")
+                `("PATH" ":" suffix
+                  (,(string-append
+                     #$(this-package-input "git-minimal") "/bin")))))))))
+    (inputs (list git-minimal
+                  python-pygit2
+                  python-requests
+                  python-u-boot-pylib))
     (synopsis "Patch automation tool")
     (description "Patman is a patch automation script which:
 @itemize
-- 
2.38.1

Message sent to guix-patches@HIDDEN:

Subject: [bug#66704] [PATCH 0/1] patman depends on Git
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Oct 2023 01:07:01 +0000
Resent-Message-ID: <handler.66704.B66704.169810959120786 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Simon Tournier <zimon.toutoune@HIDDEN>
Cc: 66704 <at> debbugs.gnu.org
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <cover.1698076987.git.zimon.toutoune@HIDDEN> (Simon Tournier's
 message of "Mon, 23 Oct 2023 18:07:56 +0200")
References: <cover.1698076987.git.zimon.toutoune@HIDDEN>
Date: Mon, 23 Oct 2023 21:05:50 -0400
Message-ID: <87jzrc6d8x.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hi Simon,

Simon Tournier <zimon.toutoune@HIDDEN> writes:

> Hi,
>
> Assume, I am running in some Git repository, e.g.,
>
>   $ git config --get branch.tmp.remote
>   origin
>
> Then, I get this error:
>
> $ guix shell -C patman -- patman -h
> Traceback (most recent call last):
>   File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2=
023.07.02/lib/python3.10/site-packages/u_boot_pylib/command.py", line 95, i=
n run_pipe
>     last_pipe =3D cros_subprocess.Popen(cmd, cwd=3Dcwd, **kwargs)
>   File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2=
023.07.02/lib/python3.10/site-packages/u_boot_pylib/cros_subprocess.py", li=
ne 83, in __init__
>     super(Popen, self).__init__(args, stdin=3Dstdin,
>   File "/gnu/store/p4x29pa0qjb3r76v2bl0jvhld42l0lkq-python-3.10.7/lib/pyt=
hon3.10/subprocess.py", line 969, in __init__
>     self._execute_child(args, executable, preexec_fn, close_fds,
>   File "/gnu/store/p4x29pa0qjb3r76v2bl0jvhld42l0lkq-python-3.10.7/lib/pyt=
hon3.10/subprocess.py", line 1845, in _execute_child
>     raise child_exception_type(errno_num, err_msg, err_filename)
> FileNotFoundError: [Errno 2] No such file or directory: 'git'
>
> During handling of the above exception, another exception occurred:
>
> Traceback (most recent call last):
>   File "/gnu/store/znq8klrhn3wwgfvrq0kqm8krx5xi7fpq-patman-2023.07.02/bin=
/.patman-real", line 47, in <module>
>     parser.add_argument('-p', '--project', default=3Dproject.detect_proje=
ct(),
>   File "/gnu/store/znq8klrhn3wwgfvrq0kqm8krx5xi7fpq-patman-2023.07.02/lib=
/python3.10/site-packages/patman/project.py", line 19, in detect_project
>     top_level =3D gitutil.get_top_level()
>   File "/gnu/store/znq8klrhn3wwgfvrq0kqm8krx5xi7fpq-patman-2023.07.02/lib=
/python3.10/site-packages/patman/gitutil.py", line 627, in get_top_level
>     return command.output_one_line('git', 'rev-parse', '--show-toplevel')
>   File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2=
023.07.02/lib/python3.10/site-packages/u_boot_pylib/command.py", line 128, =
in output_one_line
>     result =3D run_pipe([cmd], capture=3DTrue, oneline=3DTrue,
>   File "/gnu/store/50q6yz9s0ddfxbwd31sf6lq15hsy97gs-python-u-boot-pylib-2=
023.07.02/lib/python3.10/site-packages/u_boot_pylib/command.py", line 99, i=
n run_pipe
>     raise Exception("Error running '%s': %s" % (user_pipestr, str))
> Exception: Error running 'git rev-parse --show-toplevel': <class 'str'>
>
>
> That=E2=80=99s because =E2=80=99patman=E2=80=99 runs =E2=80=99git=E2=80=
=99 via the file gitutils.py, see:
>
> -*- mode:grep; default-directory: "/tmp/u-boot-2023.07.02/tools/patman/" =
-*-
>
> 20 candidates:
> ./gitutil.py:29:    cmd =3D ['git']
> ./gitutil.py:87:    pipe =3D ['git', 'name-rev', commit_hash]
> ./gitutil.py:139:        remote =3D command.output_one_line('git', '--git=
-dir', git_dir, 'config',
> ./gitutil.py:141:        merge =3D command.output_one_line('git', '--git-=
dir', git_dir, 'config',
> ./gitutil.py:231:    pipe =3D ['git']
> ./gitutil.py:252:    pipe =3D ['git', 'clone', git_dir, '.']
> ./gitutil.py:265:    pipe =3D ['git']
> ./gitutil.py:285:    pipe =3D ['git', '--git-dir', git_dir, 'worktree', '=
list']
> ./gitutil.py:300:    pipe =3D ['git', '--git-dir', git_dir, 'worktree', '=
add', '.', '--detach']
> ./gitutil.py:315:    pipe =3D ['git', '--git-dir', git_dir, 'worktree', '=
prune']
> ./gitutil.py:337:    cmd =3D ['git', 'format-patch', '-M']
> ./gitutil.py:414:        'git', 'config', 'sendemail.suppresscc', raise_o=
n_error=3DFalse)
> ./gitutil.py:496:        git_config_to =3D command.output('git', 'config'=
, 'sendemail.to',
> ./gitutil.py:511:    cmd =3D ['git', 'send-email', '--annotate']
> ./gitutil.py:627:    return command.output_one_line('git', 'rev-parse', '=
--show-toplevel')
> ./gitutil.py:636:    fname =3D command.output_one_line('git', 'config', '=
sendemail.aliasesfile',
> ./gitutil.py:654:    uname =3D command.output_one_line('git', 'config', '=
--global', 'user.name')
> ./gitutil.py:664:    uemail =3D command.output_one_line('git', 'config', =
'--global', 'user.email')
> ./gitutil.py:675:        'git', 'config', 'format.subjectprefix', raise_o=
n_error=3DFalse)
> ./gitutil.py:699:    return command.output_one_line('git', 'show', '-s', =
'--pretty=3Dformat:%H')
>
> I propose to wrap =E2=80=99patman=E2=80=99 with =E2=80=99git=E2=80=99, se=
e patch.

I see 'git send-email' in the above, so you'll also want to wrap with
`(,git "send-email").  Did you test that this suffices to get a fully
self-contained working patman?  Maybe you can send a v2 with patman.

You can add these 'Series-*' git trailers to your commit:

--8<---------------cut here---------------start------------->8---
Change-Id: xxxxxxx
[...]
Series-to: 66704 <at> debbugs.gnu.org
Series-version: 2
Series-changes: 2
 - Also add 'send-email' output of git to wrapper

--8<---------------cut here---------------end--------------->8---

Then to send, you simply do:

$ patman

And it'll annotate the patch for you and you don't need to remember
tracking the '--to' value.

--=20
Thanks,
Maxim

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 16 Apr 2024 08:47:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 16 04:47:29 2024
Received: from localhost ([127.0.0.1]:42591 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rweTR-0000PA-MX
	for submit <at> debbugs.gnu.org; Tue, 16 Apr 2024 04:47:29 -0400
Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:34734)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <steve@HIDDEN>) id 1rweTP-0000OO-OE
 for control <at> debbugs.gnu.org; Tue, 16 Apr 2024 04:47:29 -0400
Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com)
 by mailtransmit04.runbox.com with esmtps (TLS1.2) tls
 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93)
 (envelope-from <steve@HIDDEN>) id 1rweT5-00EFHd-8Q
 for control <at> debbugs.gnu.org; Tue, 16 Apr 2024 10:47:07 +0200
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject:
 To:From:Date; bh=zUJ8w6BFEuDMjOTMHU7qrHATD9RA58nxWLsEigmAoN8=; b=HX2nXwyH/TYD
 42uNL4wfJmSXvbIiRHHv32ZshULd1AZjzdhJQIwNHUi4Crrbsi3izKRKMowbI1oUooHnRE0h1Prgr
 ynJ7vhbMVN/eZu31g2FI9v4eb9hDAUrp+XUlHWA54/Bz++MyeOgk3OggdbYOQmRgBSaeDSNRDViGX
 n1DYD0oUO/L/M58QRY9AcIr2dJecOlwn1ir1anE5hHS9wB0Ny4aa5ihkKe0+YzlhNQ/0KFBUOAh19
 HDqSzewtEYdPlsLMLGFquZfgj8htUe/h/dMOAwQDzdjLeohOA8sBswraCGZRdmDDJjhncMHlQrPu5
 ZRGsqTWFpJTSI0O/Vf7VpA==;
Received: from [10.9.9.74] (helo=submission03.runbox)
 by mailtransmit02.runbox with esmtp (Exim 4.86_2)
 (envelope-from <steve@HIDDEN>) id 1rweT4-0007ov-TQ
 for control <at> debbugs.gnu.org; Tue, 16 Apr 2024 10:47:07 +0200
Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)]
 (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93)
 id 1rweT2-00BXNZ-M5
 for control <at> debbugs.gnu.org; Tue, 16 Apr 2024 10:47:04 +0200
Date: Tue, 16 Apr 2024 09:47:03 +0100
From: Steve George <steve@HIDDEN>
To: control <at> debbugs.gnu.org
Subject: owner 66704
Message-ID: <1713257218-3273-bts-steve@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
User-Agent: devscripts bts/2.22.1ubuntu1
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

owner 66704 !
thanks

Message sent to efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN, Steve George <steve@HIDDEN>:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#66704] [PATCH v2] gnu: patman: Wrap program with git.
References: <cover.1698076987.git.zimon.toutoune@HIDDEN>
In-Reply-To: <cover.1698076987.git.zimon.toutoune@HIDDEN>
Resent-From: Simon Tournier <zimon.toutoune@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN, Steve George <steve@HIDDEN>
Resent-Date: Tue, 23 Jul 2024 18:01:02 +0000
Resent-Message-ID: <handler.66704.B66704.172175763328079 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 66704 <at> debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@HIDDEN>, Efraim Flashner <efraim@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN>
X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN>
Received: via spool by 66704-submit <at> debbugs.gnu.org id=B66704.172175763328079
          (code B ref 66704); Tue, 23 Jul 2024 18:01:02 +0000
Received: (at 66704) by debbugs.gnu.org; 23 Jul 2024 18:00:33 +0000
Received: from localhost ([127.0.0.1]:60704 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sWJoO-0007HJ-Vz
	for submit <at> debbugs.gnu.org; Tue, 23 Jul 2024 14:00:33 -0400
Received: from mail-wm1-f45.google.com ([209.85.128.45]:40576)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zimon.toutoune@HIDDEN>) id 1sWJoL-00078u-VE
 for 66704 <at> debbugs.gnu.org; Tue, 23 Jul 2024 14:00:31 -0400
Received: by mail-wm1-f45.google.com with SMTP id
 5b1f17b1804b1-426659ff58bso6844975e9.2
 for <66704 <at> debbugs.gnu.org>; Tue, 23 Jul 2024 11:00:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1721757564; x=1722362364; darn=debbugs.gnu.org;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=mRsZWurgb09BEwjEV9zBw/Gcn99s9AKDCL2KbBQG68U=;
 b=Nf84b2xEBY54B8b0wxOgyXlCjucxFSUuwGFm7ZqCLmrYUGjyLDuGbSXdLCvUgPwpvc
 rEsK/i+0ZW/2cQixuBIHT3bWObBAIBSG87B0fsVR50kQ8IvjOpgNGL0dHPCJQgyqfpFp
 4qM6NUjkg2VLg7amLMpfCpToxReSpVzZWCun3oSMxAUeprmZScoUm4fsLgvyB//rpAMX
 nwNiKDFGHsosbRZbxCgX+ZZqTaoHGe/miFQ+4K0/P/haMuQBJ0LbZ8lRILu/5XfO2Zkf
 HjGrfFVd11kELDynttnPMvJJfyfERO9iOHM1fXfGn45aS3bflVMsddktY+DMsH/fhMWL
 /TCw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1721757564; x=1722362364;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=mRsZWurgb09BEwjEV9zBw/Gcn99s9AKDCL2KbBQG68U=;
 b=AZKEZMkj5MY+J2Oc+7EicKNuMvNuj/OzE7Q3jbGIZ8f9Rq6B/tcwvibrY+HNC2qXWP
 NF5tHoWEmmotO80C5yLF5+UVN1heHKF2GQWVjiaBILjFmCMIOhSfIqjDlz5CGfs4LTK/
 v0TrLT+ILrwKyfjo+JOks30SnhIualjO1CD7A1scH43vrAiDkal43tAa1S5A/GKosPOg
 bHnPsOTJ8HAmlu3lM49513tgtlC5HQzyFH9gay9T7KDQmNOmn0i6aRxs1xLBBQXCTwpI
 HlTG6EHbrsjB+i+Jz83n8WXSCnrN1nNZH22aUZ4OLfIi9AQCTvlDTuo6gYmXI3ZIp12Q
 5HFA==
X-Gm-Message-State: AOJu0YyYKlGlIMw2WO4XzjeyiJCOupu9JbSWaCe6RgfebqcV/6D71Xxt
 LnNIrbCM5PkJ/MCSOD+FTb7lqEjOsP7jEloOs5jm5CiqhdXPU5Mh7Yl3lA==
X-Google-Smtp-Source: AGHT+IFQ/GhIwLzdGmUuWVu6ELZTIbTmht+kyghlOtpp3vlb1NKbcHx1m/k+E/Wl5TgEBaNv14rxLg==
X-Received: by 2002:a05:600c:1d25:b0:426:6ea6:383d with SMTP id
 5b1f17b1804b1-427df79db74mr40756595e9.2.1721757563977; 
 Tue, 23 Jul 2024 10:59:23 -0700 (PDT)
Received: from lili.. (2a02-8429-6820-f501-e58e-8032-398d-7493.rev.sfr.net.
 [2a02:8429:6820:f501:e58e:8032:398d:7493])
 by smtp.gmail.com with ESMTPSA id
 5b1f17b1804b1-427d2a43598sm212580875e9.1.2024.07.23.10.59.22
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 23 Jul 2024 10:59:23 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
Date: Tue, 23 Jul 2024 19:59:18 +0200
Message-ID: <3b43a54f344bbe0824d351915fdb4db979b10a00.1721757000.git.zimon.toutoune@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/bootloaders.scm (patman): Replace by 'package/inherit'.
[arguments]: Add 'wrap-program' that uses git dependency.
[inputs]: Add git and git:send-email.

Change-Id: Id4ebadd518f271baa087161b10455ec03d6f959b
---
 gnu/packages/bootloaders.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

Hi,

On Mon, 23 Oct 2023 at 21:05, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote:

> I see 'git send-email' in the above

Good catch!  Added.  However, I am not happy with the mix of “styles”.  And I
suspect a “bug” or something lacking for packages with multiple outputs; I am
going to open a report about that.  Another story and not blocking, IMHO.


>                        Did you test that this suffices to get a fully
> self-contained working patman?  Maybe you can send a v2 with patman.

Not really tested.  Well, I do not know what means:

        owner 66704 !
        thanks

that Steve sent to control.  Steve, do you want to give a try and test if this
patman package is a fully self-contained working patman? ;-)


Cheers,
simon


diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 4072df50d7..e974feae5a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2021 Stefan <stefan-guix@HIDDEN>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;; Copyright © 2023 Herman Rimm <herman@HIDDEN>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2024 Zheng Junjie <873216071@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -71,6 +72,7 @@ (define-module (gnu packages bootloaders)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages python-web)
@@ -965,8 +967,7 @@ (define-public python-u-boot-pylib
 ;;; This is packaged separately, as it can be used in other contexts than for
 ;;; U-Boot development.
 (define-public patman
-  (package
-    (inherit u-boot)
+  (package/inherit u-boot
     (name "patman")
     (build-system pyproject-build-system)
     (arguments
@@ -991,8 +992,21 @@ (define-public patman
             (lambda _
               (substitute* "pyproject.toml"
                 (("patman.__main__:run_patman")
-                 "patman.__main__")))))))
-    (inputs (list python-pygit2 python-requests python-u-boot-pylib))
+                 "patman.__main__"))))
+          (add-after 'install 'wrap-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((git:send-email (assoc-ref inputs "git:send-email")))
+                (wrap-program (string-append #$output "/bin/patman")
+                  `("PATH" ":" prefix
+                    (,(string-append #$(this-package-input "git") "/bin")))
+                  `("GIT_EXEC_PATH" ":" prefix
+                    (,(string-append #$(this-package-input "git") "/libexec/git-core")
+                     ,(string-append git:send-email "/libexec/git-core"))))))))))
+    (inputs `(("git" ,git)
+              ("git:send-email" ,git "send-email")
+              ("python-pygit2" ,python-pygit2)
+              ("python-requests" ,python-requests)
+              ("python-u-boot-pylib" ,python-u-boot-pylib)))
     (synopsis "Patch automation tool")
     (description "Patman is a patch automation script which:
 @itemize

base-commit: d007b64356764f49677c78d82643f1125b5353b7
-- 
2.41.0

Last modified: Tue, 23 Jul 2024 18:15:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.