guix-commits
[Top][All Lists]
Advanced

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

06/13: import: pypi: Gracefully handle missing project home page.


From: guix-commits
Subject: 06/13: import: pypi: Gracefully handle missing project home page.
Date: Mon, 7 Mar 2022 16:50:54 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit ebb03447f8cc93b9e070b3e7706d7a64d5d1772c
Author: Ludovic Court├Ęs <ludo@gnu.org>
AuthorDate: Mon Mar 7 22:06:28 2022 +0100

    import: pypi: Gracefully handle missing project home page.
    
    Fixes <https://issues.guix.gnu.org/54259>.
    Reported by Ricardo Wurmus <rekado@elephly.net>.
    
    * guix/import/pypi.scm (pypi->guix-package): Upon
    'missing-source-error?', raise '&fix-hint' only if
    'project-info-home-page' returns a non-empty string.
---
 guix/import/pypi.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index e07b792c53..edfca3454b 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -500,19 +500,22 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, 
and LICENSE."
             (guard (c ((missing-source-error? c)
                        (let ((package (missing-source-error-package c)))
                          (raise
-                          (make-compound-condition
+                          (apply
+                           make-compound-condition
                            (formatted-message
                             (G_ "no source release for pypi package ~a ~a~%")
                             (project-info-name info) version)
-                           (condition
-                            (&fix-hint
-                             (hint (format #f (G_ "This indicates that the
+                           (match (project-info-home-page info)
+                             ((or #f "") '())
+                             (url
+                              (list
+                               (condition
+                                (&fix-hint
+                                 (hint (format #f (G_ "This indicates that the
 package is available on PyPI, but only as a \"wheel\" containing binaries, not
 source.  To build it from source, refer to the upstream repository at
 @uref{~a}.")
-                                           (or (project-info-home-page info)
-                                               (project-info-url info)
-                                               "?"))))))))))
+                                               url))))))))))))
               (make-pypi-sexp (project-info-name info) version
                               (and=> (source-release project version)
                                      distribution-url)



reply via email to

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