guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: patman: Fix execution.


From: guix-commits
Subject: branch master updated: gnu: patman: Fix execution.
Date: Fri, 01 Sep 2023 01:21:35 -0400

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c7c500dd61 gnu: patman: Fix execution.
c7c500dd61 is described below

commit c7c500dd61ec4bf6feb9769858b3a7041c9ace71
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Sep 1 00:24:40 2023 -0400

    gnu: patman: Fix execution.
    
    Before this change, patman would fail at run time with "AttributeError: 
module
    'patman.__main__' has no attribute 'run_patman'" since the last U-Boot 
update.
    
    * gnu/packages/bootloaders.scm (patman) [arguments]
    <phases>: New patch-pyproject.toml phase.
---
 gnu/packages/bootloaders.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 069d02b52c..1c47636341 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -881,7 +881,17 @@ commands part of the U-Boot project, such as Patman.")))
           (delete 'sanity-check)
           (add-after 'unpack 'chdir
             (lambda _
-              (chdir "tools/patman"))))))
+              (chdir "tools/patman")))
+          (add-after 'chdir 'patch-pyproject.toml
+            ;; There is no 'run_patman' procedure in the __main__.py script,
+            ;; which breaks execution
+            ;; Patch submitted upstream (see:
+            ;; https://patchwork.ozlabs.org/project/uboot/\
+            ;; patch/20230901050532.725-1-maxim.cournoyer@gmail.com/).
+            (lambda _
+              (substitute* "pyproject.toml"
+                (("patman.__main__:run_patman")
+                 "patman.__main__")))))))
     (inputs (list python-pygit2 python-requests python-u-boot-pylib))
     (synopsis "Patch automation tool")
     (description "Patman is a patch automation script which:



reply via email to

[Prev in Thread] Current Thread [Next in Thread]