guix-commits
[Top][All Lists]
Advanced

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

02/04: import: crate: Gracefully handle non-existent crates.


From: guix-commits
Subject: 02/04: import: crate: Gracefully handle non-existent crates.
Date: Mon, 27 Apr 2020 17:29:51 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 5fbc753ab524809cd81e3e5c54b3d0acbe33792d
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Apr 27 22:17:53 2020 +0200

    import: crate: Gracefully handle non-existent crates.
    
    Fixes <https://bugs.gnu.org/40891>.
    Reported by Hartmut Goebel <address@hidden>.
    
    * guix/import/crate.scm (crate->guix-package): Wrap value of
    'version-number' and 'version*' in (and crate ...).
---
 guix/import/crate.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 0b4482e..e3ec11d 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -201,14 +201,16 @@ latest version of CRATE-NAME."
     (lookup-crate crate-name))
 
   (define version-number
-    (or version
-        (crate-latest-version crate)))
+    (and crate
+         (or version
+             (crate-latest-version crate))))
 
   (define version*
-    (find (lambda (version)
-            (string=? (crate-version-number version)
-                      version-number))
-          (crate-versions crate)))
+    (and crate
+         (find (lambda (version)
+                 (string=? (crate-version-number version)
+                           version-number))
+               (crate-versions crate))))
 
   (and crate version*
        (let* ((dependencies   (crate-version-dependencies version*))



reply via email to

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