From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: bug#23780: [PATCH] import: pypi: do not fail when 'run_requires' is missing from the metadata. Date: Fri, 17 Jun 2016 14:43:55 +0200 Message-ID: <1466167435-10265-1-git-send-email-tipecaml@gmail.com> References: <20160617061639.666c57c6@scratchpost.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDt8z-000139-NG for bug-guix@gnu.org; Fri, 17 Jun 2016 08:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDt8w-0001od-F5 for bug-guix@gnu.org; Fri, 17 Jun 2016 08:45:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDt8w-0001oY-Bh for bug-guix@gnu.org; Fri, 17 Jun 2016 08:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bDt8w-0004Bk-5p for bug-guix@gnu.org; Fri, 17 Jun 2016 08:45:02 -0400 In-Reply-To: <20160617061639.666c57c6@scratchpost.org> Sender: "Debbugs-submit" Resent-Message-ID: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 23780@debbugs.gnu.org * guix/import/pypi.scm (read-wheel-metadata): do not crash when 'run_requires' is missing from the metadata. --- guix/import/pypi.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 70ef507..f08d948 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -175,8 +175,10 @@ cannot determine package dependencies")) (lambda (port) (let* ((metadata (json->scm port)) (run_requires (hash-ref metadata "run_requires")) - (requirements (hash-ref (list-ref run_requires 0) - "requires"))) + (requirements (if run_requires + (hash-ref (list-ref run_requires 0) + "requires") + '()))) (map (lambda (r) (python->package-name (clean-requirement r))) requirements))))) -- 2.6.2