From unknown Sun Jul 27 09:33:44 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#66704 <66704@debbugs.gnu.org> To: bug#66704 <66704@debbugs.gnu.org> Subject: Status: [PATCH 0/1] patman depends on Git Reply-To: bug#66704 <66704@debbugs.gnu.org> Date: Sun, 27 Jul 2025 16:33:44 +0000 retitle 66704 [PATCH 0/1] patman depends on Git reassign 66704 guix-patches submitter 66704 Simon Tournier severity 66704 normal tag 66704 patch owner 66704 Steve George thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 12:08:54 2023 Received: (at submit) by debbugs.gnu.org; 23 Oct 2023 16:08:54 +0000 Received: from localhost ([127.0.0.1]:51408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quxU5-0002TX-TF for submit@debbugs.gnu.org; Mon, 23 Oct 2023 12:08:54 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quxU4-0002TL-2S for submit@debbugs.gnu.org; Mon, 23 Oct 2023 12:08:52 -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 1quxTT-0006sY-PJ for guix-patches@gnu.org; Mon, 23 Oct 2023 12:08:15 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quxTR-0000mE-PV for guix-patches@gnu.org; Mon, 23 Oct 2023 12:08:15 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-408cd9660b8so4921115e9.1 for ; Mon, 23 Oct 2023 09:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698077292; x=1698682092; darn=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=TDJZQFU371sST6qREgSQ3LFRiSX21fXmJXux55jFOag=; b=EPpMIJYoE/gRQW8cF4HeQRFzcg1zqGzv5EhXffg6pOg+QGZ9JnZfgElkwxTQvpW2sx oBOz1sE44qYtV64YiDpSbodEW4KmvmYSQhnA74Zse1ZKFC1RcomBB7LVg/z3qhY82vx9 WjoTcYpUm3dh5B0yIb9glrRnD86sY4bN04H/xy6llL7syTwRccUaXC7b93wInelUYp8t 5mz1N8lymqq3xSX7WU0OdYf2iljj0WJkEYdJP0KOg3H5ouEHa27ktYiiurD8/C+sEXu7 UMJfGdzAK89pu0LYbYOeNhStpbsMcZ8IUQASQMCzZajWvw4Hc1SH50WExIVdPKT12gNa cxxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698077292; x=1698682092; 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=TDJZQFU371sST6qREgSQ3LFRiSX21fXmJXux55jFOag=; b=MetpifuU0jYP3cl3mspzB7qVhxLjqRNHrT1aeoq4E/P5K7P0IG1V3Nxz36pVIeSuDI RSVBsaMfs5Cu/RBQORoDdMubmJlWA+e9e2tDt7UeWUMRQXBCaAcIr5E1E1PtE520VRZP Ei3iX4xeCr7WQ87ruX8QvS/mBamFMmsymvqH51hwqSxFWkVVsW6J1zuCphTQbLtqu4j0 Ka3Q65ZcCDwtk10VFNArsaMTfake9Hd5miU1zqcoA8KpcCQchWOFWnqNaHRflBYrmQft YmhAunNSdaV8IB5M86xLXiE4s82+PLXqaS6wYFEKDb/DzZc308tTl1qSouhznkpSbYZJ 75Mw== X-Gm-Message-State: AOJu0YxsQPZlmfFaUSVVTVbtJ8nehi6dV8gFbx8qU91syE6x/q48KBFN 8DKxHBoGoqi9vjlgK6ngvU8v+QiIRSQ= X-Google-Smtp-Source: AGHT+IEKYL5GTzvWSZ+jcc3dVtIZX7XRHn2tzxorqJIKZlw9h5Cvjv6uMvVdheALOiiJiLXEsEybpw== X-Received: by 2002:a05:600c:450a:b0:406:513d:738f with SMTP id t10-20020a05600c450a00b00406513d738fmr7345693wmo.2.1698077291700; Mon, 23 Oct 2023 09:08:11 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id bg34-20020a05600c3ca200b00402f713c56esm9919031wmb.2.2023.10.23.09.08.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 09:08:11 -0700 (PDT) From: Simon Tournier To: guix-patches@gnu.org Subject: [PATCH 0/1] patman depends on Git Date: Mon, 23 Oct 2023 18:07:56 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Debbugs-CC: maxim.cournoyer@gmail.com 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@gmail.com; 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-Debbugs-Envelope-To: submit Cc: Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 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': --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 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 12:26:47 2023 Received: (at 66704) by debbugs.gnu.org; 23 Oct 2023 16:26:47 +0000 Received: from localhost ([127.0.0.1]:51426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quxlP-0002uM-EC for submit@debbugs.gnu.org; Mon, 23 Oct 2023 12:26:47 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quxlL-0002u2-O4 for 66704@debbugs.gnu.org; Mon, 23 Oct 2023 12:26:45 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-408363c2918so3914895e9.0 for <66704@debbugs.gnu.org>; Mon, 23 Oct 2023 09:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698078368; x=1698683168; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7JycLcK8tBW5BNuYbrhsDT2STagGUQtbc/SKoJRf3lo=; b=j64kuwBe8g5Us7716nM9riQG5zA5itPPrWMsRz/1YjyAppCmnpUqDfC+Qh3wlww0F/ ax9H+aW5eJBZeXdQ+TSiy+SCGyXmBk1O1RjlMAaoOUGBS1yuSjfDUv9dwveCHNRwtp1F 5tbu9rV7GEH3KECjoO6MInp9qwd7J+Ylm2ZmWI/OJKfYiCPsa/n+yTDjGBEI9J+NyLm5 UZms2iUPfSE/UvJCxTwQUM2jPvXBgWGiDUen4WAa4da8bDOPJYfqR1XILlSmccJnwnBT HWLMxH5rG3LkgGEw5WwHhPQZ0NyeYel06hbbOtgYteb2xoehkOcgyD4pB7WAL17HI6ZW zVpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698078368; x=1698683168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7JycLcK8tBW5BNuYbrhsDT2STagGUQtbc/SKoJRf3lo=; b=ObjenjMDr3eIlnFicixy6TUHqkA6ifKRKLWKkLD0jB+aAwi9it8zGl/dmHGi4EvbWQ Snyqlhhl9+S01cu25xicT00TY9gqdS7evAc71CXZeWyMvzInjs/h+JXMSv0Xb0LWKo2T PGNwX8FtT/j7mpfEHQIJNj/0UNAUGMzopthfbkqRd9wpRzAiVhDBsNQd0/NPwyGVzBtQ 71sbs4D0bdWHQ7349gSdpPTclITJltKfiK7d9LCXD4hrdB0yJDcwmSMWKz/61MIEBf93 TjgPQQ6qOkroLOebfTfLAsdJmH1+xKzAKeVwnpIKKyugdFQ9m8MnsZ8ZQmo3OT1+i1h1 W+1g== X-Gm-Message-State: AOJu0Yxi0RcO+58XYpWZtWYGmjIR/u0e6AmcjmCwxBBNTdDvCUPBiofh p1FLMNHv21eP8q/b76HOzOmGi8y+WU0= X-Google-Smtp-Source: AGHT+IF3D4Ode4LoUDdpTzDDt+b3jkkUHUKJ5lXRHb+7pjnqvB2klZaTrxIHVGbLtg5Unb+DZBCE0Q== X-Received: by 2002:a05:600c:1c06:b0:405:4721:800 with SMTP id j6-20020a05600c1c0600b0040547210800mr7140624wms.1.1698078368427; Mon, 23 Oct 2023 09:26:08 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id v19-20020a05600c471300b00405959bbf4fsm9919415wmo.19.2023.10.23.09.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 09:26:08 -0700 (PDT) From: Simon Tournier To: 66704@debbugs.gnu.org Subject: [PATCH 1/1] gnu: patman: Wrap program with git. Date: Mon, 23 Oct 2023 18:26:00 +0200 Message-Id: <377171f13a5d00cc460c394a6e0226f6cdcf217a.1698076987.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66704 Cc: Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 ;;; Copyright © 2021 Stefan ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 Simon Tournier ;;; ;;; 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 21:06:30 2023 Received: (at 66704) by debbugs.gnu.org; 24 Oct 2023 01:06:31 +0000 Received: from localhost ([127.0.0.1]:52603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5sM-0005PC-7u for submit@debbugs.gnu.org; Mon, 23 Oct 2023 21:06:30 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:54444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5sJ-0005Os-2Q for 66704@debbugs.gnu.org; Mon, 23 Oct 2023 21:06:28 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-7789a4c01easo257411185a.0 for <66704@debbugs.gnu.org>; Mon, 23 Oct 2023 18:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698109552; x=1698714352; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K6P3xRACR7PYKCD3SfUzyQRJq065QdZb/tqPFK/bNLA=; b=CW3F/P4556OqQi8hpzlzSbv+xgxGT93zkccRCzhyTCs+ThyzfvW7NqPaeAIDBVvIBB d39MPBGXJzhTZXiwr8oIRvN8K1GePtYfw9UV+1fH6uY7xuJruAaCLaf1CgWdR0nb6BsS yRpnmVKNDAhLpgdnIxugPfNvQES9yhduTyNDVBSGcFidKYeD9LIxwUze8RlGMcEiuEb4 4dSBUBvG1Je382Z19B6F2QSWb9W0j3JRppKx96+xEQ0wrn405eovEBizsupDE+GMCdg0 gEmefInEDRFUNh9TdHQfqAPOg6SoCCNCwBBqijpYSZkfM2cDwmmqcXKfggGJ1YF1DHod tNxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698109552; x=1698714352; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=K6P3xRACR7PYKCD3SfUzyQRJq065QdZb/tqPFK/bNLA=; b=QoujAMxISfArbJUoN9qgU5SsGF6RlEi/BBqS/cecIUKAy6UE0S0EtxmC5XDW/4NL9G yD36TKdVkECzH2c6kP7owwHNLpZY2RvRWSEe/vUfeHBVS4oJlhcRoCSuatZSXRBmt0c6 We5qcSsOQBCeZvqBuomYR5sRYNPxZCVChDFz/dA//BL+lGBKtj9kRiwLpdlqdXV8odI5 afoeZB9CudI9iTMYwCB+h6cUlrtUC5FJRM8StcUUSyOTmDNMlwC4yRjpugO7Nr7ZMC+C 6GQMK+lfEcLvHflRSEq7T0imo8ZWrJ5TEYkSdowLuGxlO9YJgH8FMoG2zjzitk/NEw7m LIYQ== X-Gm-Message-State: AOJu0YyE+bmoPWRTTJsYV/8khxTtZsL2kHsFRYud+B4+KhiB7obdajDO BMGSztwnQkx6US8639Ix5MtkhjhKyJ7TTQ== X-Google-Smtp-Source: AGHT+IH0d4IhfCUn4/7NqeF1k4vQwHv5ch0EJfx7qj7sWTFHkpwG3WfN8IBoeZTGaEwBoDoPa/yXWA== X-Received: by 2002:a05:620a:40d6:b0:778:b559:4744 with SMTP id g22-20020a05620a40d600b00778b5594744mr9232816qko.58.1698109551997; Mon, 23 Oct 2023 18:05:51 -0700 (PDT) Received: from hurd (dsl-10-148-194.b2b2c.ca. [72.10.148.194]) by smtp.gmail.com with ESMTPSA id qs21-20020a05620a395500b007671cfe8a18sm3109231qkn.13.2023.10.23.18.05.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 18:05:51 -0700 (PDT) From: Maxim Cournoyer To: Simon Tournier Subject: Re: [bug#66704] [PATCH 0/1] patman depends on Git In-Reply-To: (Simon Tournier's message of "Mon, 23 Oct 2023 18:07:56 +0200") References: Date: Mon, 23 Oct 2023 21:05:50 -0400 Message-ID: <87jzrc6d8x.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66704 Cc: 66704@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Simon, Simon Tournier 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 > 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': > > > 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@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 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 16 04:47:29 2024 Received: (at control) by debbugs.gnu.org; 16 Apr 2024 08:47:30 +0000 Received: from localhost ([127.0.0.1]:42591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rweTR-0000PA-MX for submit@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 ) id 1rweTP-0000OO-OE for control@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 ) id 1rweT5-00EFHd-8Q for control@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 ) id 1rweT4-0007ov-TQ for control@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@debbugs.gnu.org; Tue, 16 Apr 2024 10:47:04 +0200 Date: Tue, 16 Apr 2024 09:47:03 +0100 From: Steve George To: control@debbugs.gnu.org Subject: owner 66704 Message-ID: <1713257218-3273-bts-steve@futurile.net> 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@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) owner 66704 ! thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 23 14:00:33 2024 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 ) id 1sWJoO-0007HJ-Vz for submit@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 ) id 1sWJoL-00078u-VE for 66704@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@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 To: 66704@debbugs.gnu.org Subject: [PATCH v2] gnu: patman: Wrap program with git. Date: Tue, 23 Jul 2024 19:59:18 +0200 Message-ID: <3b43a54f344bbe0824d351915fdb4db979b10a00.1721757000.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-CC: Maxim Cournoyer , Steve George X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66704 Cc: Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 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 ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2023 Herman Rimm +;;; Copyright © 2023 Simon Tournier ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 14 09:02:55 2024 Received: (at 66704-done) by debbugs.gnu.org; 14 Sep 2024 13:02:55 +0000 Received: from localhost ([127.0.0.1]:45069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spSQR-0004Sp-8u for submit@debbugs.gnu.org; Sat, 14 Sep 2024 09:02:55 -0400 Received: from mail-pf1-f179.google.com ([209.85.210.179]:42259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spSQP-0004Sa-FO for 66704-done@debbugs.gnu.org; Sat, 14 Sep 2024 09:02:54 -0400 Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-718d91eef2eso1949573b3a.1 for <66704-done@debbugs.gnu.org>; Sat, 14 Sep 2024 06:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726318897; x=1726923697; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uwzbkPnuyxWERprgrYzzCDqQ3lc6K+kXm6q7RGtFaWc=; b=Br9qGJ5FloAi1FQ5bBOXSg/0CrBHnpANN4pUSW5E7YlbunWaavaa88Md2ZyMaSnyea rZeXyLiROeLF1La5vaDnQfyIKIOT6m7OOXP1lhQXoYaMA/x86MGgMfeJmGBnGisN7Br7 APznzl0AA39+D18b0o7khE4GWngX8e/QFkA4SqlDL5WGWGSB+l/XcakoCCDl5iMocbkV KVGFwbmvKenE4UO5BfVphQTrIEceGC44qP+JY16Y5D4SiTu4S0iF244f42LS1PWt6KT6 UiynlSELGBjwLns7FeT4JHStHT/f3kwkFvYWinpP8OQW0QNF0VYwr5DMjOtxNWNJaLqJ nJxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726318897; x=1726923697; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uwzbkPnuyxWERprgrYzzCDqQ3lc6K+kXm6q7RGtFaWc=; b=EM9cWf86L4mHyhoL1lc6PhveUxFjetIAB9d8vrPYsL4abCW7+6+eBxyhLiQcbzUPT2 WHrrF23dQPrInyKHky9QBgHRrhtToKVCB23Ok1DO/IOCfzPXm1drmu0VPqWZaELpAaCO tQn4/hR/Ohk6UsrbA+krZ4HCZd52AzjTMw0BVnfmrjKSctol6Bi0NwkYLpB8qmLQJx/K fqn+xIpYOpEQlhSwejk1p7E5O4gZz25qjQRGE37QAoU57zFHgj8PV94h1xAoKHMMNJt4 EAwnfEDdSi8wyOcrZ7/0CLGQKfQ2Yeta95FbDfgSRF6A1GVenKVT3wSZJmoj7vNCEvx5 eO+A== X-Gm-Message-State: AOJu0YzzHYz5gbNEDkhxF6UOMYskR0lbybPTx1cTbwvvK9Pt5JD5jgWG hFj1OYotPXNYfq3BotD6ZyuIIbHjI+dN63BDfabmIedpB4wtccXq X-Google-Smtp-Source: AGHT+IHF7nC+ITI1FeWlYsOlw4L/xwvLyNl7av5mlcx1vwmVMYznXcwwO6NNVXlzEc6RtpbQYYCnSQ== X-Received: by 2002:a05:6a21:6e41:b0:1cf:3338:a475 with SMTP id adf61e73a8af0-1cf755c7824mr16816215637.9.1726318896496; Sat, 14 Sep 2024 06:01:36 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71944b97608sm955959b3a.153.2024.09.14.06.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Sep 2024 06:01:35 -0700 (PDT) From: Maxim Cournoyer To: Simon Tournier Subject: Re: [bug#66704] [PATCH v2] gnu: patman: Wrap program with git. In-Reply-To: <3b43a54f344bbe0824d351915fdb4db979b10a00.1721757000.git.zimon.toutoune@gmail.com> (Simon Tournier's message of "Tue, 23 Jul 2024 19:59:18 +0200") References: <3b43a54f344bbe0824d351915fdb4db979b10a00.1721757000.git.zimon.toutoune@gmail.com> Date: Sat, 14 Sep 2024 22:01:33 +0900 Message-ID: <87bk0qtmmq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66704-done Cc: 66704-done@debbugs.gnu.org, Vagrant Cascadian , Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Simon, Simon Tournier writes: > * gnu/packages/bootloaders.scm (patman): Replace by 'package/inherit'. I don't think package/inherit is appropriate here; patman is not a variant of u-boot (doesn't share any of its inputs) -- it jut happens to have its source part of the u-boot sources. I've dropped it. > [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 = wrote: > >> I see 'git send-email' in the above > > Good catch! Added. However, I am not happy with the mix of =E2=80=9Csty= les=E2=80=9D. And I > suspect a =E2=80=9Cbug=E2=80=9D or something lacking for packages with mu= ltiple 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. [...] > (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") "/libe= xec/git-core") > + ,(string-append git:send-email "/libexec/git-core")= ))))))))) I think 'search-input-file' would be better here. It should be preferred to gexps in general, as it is more lazy and works better with inheritance. > + (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 I modified this to avoid adding labels, which was not necessary. I've also used wrap-script, which inserts the wrapping in the Python script directly instead of creating a .patman-real wrapper, which uglifies the process name in top, for example. You'll find the result in commit 4c99ef43f0. Thanks for kicking the ball. --=20 Thanks, Maxim From unknown Sun Jul 27 09:33:44 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 13 Oct 2024 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 06 11:44:13 2024 Received: (at control) by debbugs.gnu.org; 6 Dec 2024 16:44:13 +0000 Received: from localhost ([127.0.0.1]:44068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tJbR7-0002MJ-0x for submit@debbugs.gnu.org; Fri, 06 Dec 2024 11:44:13 -0500 Received: from mail-qv1-f67.google.com ([209.85.219.67]:43167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tJbR5-0002M9-AS for control@debbugs.gnu.org; Fri, 06 Dec 2024 11:44:11 -0500 Received: by mail-qv1-f67.google.com with SMTP id 6a1803df08f44-6d89a727a19so30557796d6.0 for ; Fri, 06 Dec 2024 08:44:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733503390; x=1734108190; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=rXBcfDeNjZa+2nWAaMMTg+Rxn/LNef0UaANSQl0RwpY=; b=ZKACVjudN5l8OIbFc1gwb9rp1F6vGwc8oj4T7BRy43Z5GSsqvkAtikzwWLl19nwWVc Icjbr4Fht1logFl7nK/G4RncRP0qbuKAviyxwk2ePM8T9824AYWcZKhC1H4exdtVy6JN znf/WgiUg7xBJE61THExoJvv2zmXqE3GUS31ZbbnWIehvngAEWC4QN3bFkD6Z/JyqMCf VW6SKo26R1uf36z9AR0GY61/5OHVj9eI07ZxjFS1HB5PWOltVPRpKvXEKE0nYflfcq3X qw8G/0/3vAQOqJyLEWMLzNV0TiVjxJ3IkykNLSkzsye8eIoGaP3akOAaroAXPMbGd1D0 lnag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733503390; x=1734108190; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rXBcfDeNjZa+2nWAaMMTg+Rxn/LNef0UaANSQl0RwpY=; b=QRCqk9AUne/kzYb28kpbF5nE9yQw3eLJiku5/VH0djgye5S0NvlpBH7k0zVn4hxW/E CABrAXPAdDgJAsCqGnrnciowRGe8MepOKngt7rbg63PPxFv/csb34vyDTMff4yxDS9lC +VFkZ5sWbGdZ0Nxmx7y8zMmZWFgNMhMZH0Y5ECVSKxg5ayZDE5LIGIxs8tZAfULaGVcI 63mcOGnHRiZVoKy5ELvrL/FSzgGqlR1SPX8nfeOm2aUfpQUPWn/Vl5318IrMez+bDi6j kSKBamcxhZuNAj+p5caOSzhyDafqsnhlFpnF2I2SAlgVrwMwt6yMoR2fw/1Tbhc6xpnx FbGw== X-Gm-Message-State: AOJu0Yzt1g+b1wG3wqoWkEpyv0WySAK399EQ88DP7G0AvZb6WRfVvPPq usYKDEHSh180qqWMVTp29XBTH1szOdE0BejW2CNNKUI+dPCsVem2vDhvYN++ X-Gm-Gg: ASbGnctGA/0iUdBETdkM03J02hiCupl/wkp7pEj1j0Vw3dbBtzQ9sQ2rAMP7dYcPIFU ibNxtxw8ADwTHNwoXuGvAi8o6mw1Nkvrjsw0HF/bxh8uV36x0gicmtNXIkb9m5yaCT5LEjlq9ad l9k3p9wFtJW0zWx3TF4GReEBbrF4xmiOfBY3NkNwyWa1MimnCO+HGKnslIZD1MYWgTvrcPsfCf8 Ihd8P1Y0F+U/wXqGqIPEU8FpELgrBOFn+T6CNYve17qSg== X-Google-Smtp-Source: AGHT+IH+zyqzip6PV5p8YK0lp1CIl+WYqtkKud6aWgDcKdSYa0ogT41CZXNmZRFejnfOjAcNuMEtbA== X-Received: by 2002:a05:6214:e4c:b0:6d8:b81c:ecc1 with SMTP id 6a1803df08f44-6d8e64e3754mr56039816d6.13.1733503390576; Fri, 06 Dec 2024 08:43:10 -0800 (PST) Received: from gnus ([70.26.179.129]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8e8ce455fsm9977756d6.122.2024.12.06.08.43.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2024 08:43:10 -0800 (PST) From: "Suhail Singh" To: control@debbugs.gnu.org Subject: control message to remove under-review tag from archived bugs Date: Fri, 06 Dec 2024 11:42:59 -0500 Message-ID: <87wmgc225o.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) user guix unarchive 73576 usertag 73576 - under-review archive 73576 unarchive 68239 usertag 68239 - under-review archive 68239 unarchive 67123 usertag 67123 - under-review archive 67123 unarchive 66704 usertag 66704 - under-review archive 66704 quit