GNU bug report logs - #42206
[PATCH] import: pypi: Handle 'null instead of #nil.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42206 in the body.
You can then email your comments to 42206 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: guix-patches <at> gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH] import: pypi: Handle 'null instead of #nil.
Date: Sun,  5 Jul 2020 04:11:45 +0530

* guix/import/pypi.scm (non-empty-string-or-false): guile-json now returns
'null instead of #nil for null JSON values. Handle it.
---
 guix/import/pypi.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index b20c2300f6..a2b5d995ef 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
 ;;; Copyright © 2020 Lars-Dominik Braun <ldb <at> leibniz-psychology.org>
+;;; Copyright © 2020 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -63,7 +64,7 @@
   (match-lambda
     ("" #f)
     ((? string? str) str)
-    ((or #nil #f) #f)))
+    ((or 'null #f) #f)))
 
 ;; PyPI project.
 (define-json-mapping <pypi-project> make-pypi-project pypi-project?
-- 
2.26.2

Message #8 received at 42206 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: 42206 <at> debbugs.gnu.org
Subject: Re: [bug#42206] [PATCH] import: pypi: Handle 'null instead of #nil.
Date: Sun, 05 Jul 2020 09:58:27 +0200

Hello Arun,

>      ((? string? str) str)
> -    ((or #nil #f) #f)))
> +    ((or 'null #f) #f)))

This LGTM.

Thanks,

Mathieu

Message #13 received at 42206-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: 42206-done <at> debbugs.gnu.org
Subject: Re: [bug#42206] [PATCH] import: pypi: Handle 'null instead of #nil.
Date: Sun, 05 Jul 2020 16:12:55 +0530

[Message part 1 (text/plain, inline)]

Pushed to master, thanks!

[signature.asc (application/pgp-signature, inline)]

Previous Next

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