From patchwork Fri Dec 1 09:29:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57170 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7D6EE27BBE9; Fri, 1 Dec 2023 09:32:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5AFAB27BBE2 for ; Fri, 1 Dec 2023 09:32:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8zsP-0002Qa-Qx; Fri, 01 Dec 2023 04:32:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8zsJ-0002Ju-32 for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8zsI-0007Yy-FH for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8zsQ-0008Ll-HM; Fri, 01 Dec 2023 04:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH 2/3] guix: import: stackage: Fix crash on recursive import Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67564 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67564@debbugs.gnu.org Cc: Saku Laesvuori , Lars-Dominik Braun X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by 67564-submit@debbugs.gnu.org id=B67564.170142308232028 (code B ref 67564); Fri, 01 Dec 2023 09:32:02 +0000 Received: (at 67564) by debbugs.gnu.org; 1 Dec 2023 09:31:22 +0000 Received: from localhost ([127.0.0.1]:55087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zrl-0008KW-Lq for submit@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:21 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:56744 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zrj-0008KO-OU for 67564@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:20 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.61]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 90C2D340103; Fri, 1 Dec 2023 10:31:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701423071; bh=Fz49Q5sHHdurKSL1aoQia0H1mbbCEvGjhlHcwnSq4kE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=n5iPokfv7JH+alXT6aIcJybUhtmabqo8bf//jEl9cIU9Cdl3JAqibeaLxA5EUxMF7 aJxyUwRHRMneJ3+WAQd9Iu1/9fpdiFaXmTdkrFOVSUc6lc9gHxwejNKn9j4hCbxn45 Ew4VDaMEdE5N2uuL48CaYrnmC0ovAIl6fmR6m9T8= Date: Fri, 1 Dec 2023 11:29:47 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701422983.git.saku@laesvuori.fi> References: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701422983.git.saku@laesvuori.fi> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/stackage.scm (lts-package-version): Call stackage-package-version only when the package is found. Change-Id: Ic8d7c1b7a42a9c1a6cbba567e148706507a53ee3 --- guix/import/stackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 00814c7d46..f801835b33 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -92,7 +92,7 @@ (define (lts-package-version packages name) "Return the version of the package with upstream NAME included in PACKAGES." (let ((pkg (find (lambda (pkg) (string=? (stackage-package-name pkg) name)) packages))) - (stackage-package-version pkg))) + (and=> pkg stackage-package-version))) ;;;