GNU bug report logs - #71981
[PATCH] services: configuration: Produce doc even if package->symbol fails.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Tomas Volf <~@wolfsden.cz>; Keywords: patch; dated Sun, 7 Jul 2024 17:29:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 71981 <at> debbugs.gnu.org:


Received: (at 71981) by debbugs.gnu.org; 6 Oct 2024 15:15:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 06 11:15:44 2024
Received: from localhost ([127.0.0.1]:41945 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sxSz2-0007KV-1k
	for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 11:15:44 -0400
Received: from wolfsden.cz ([37.205.8.62]:36988)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <~@wolfsden.cz>) id 1sxSyx-0007KJ-Eo
 for 71981 <at> debbugs.gnu.org; Sun, 06 Oct 2024 11:15:42 -0400
Received: by wolfsden.cz (Postfix, from userid 104)
 id 9C4E031E42D; Sun,  6 Oct 2024 15:15:31 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
 t=1728227731; bh=ppHqUBAGIWel1tWhl8rRmEZuQRQjcPp1DUvvy2oKHLE=;
 h=From:To:Cc:Subject:Date;
 b=jz3gw3wph7XOyKq/8yQ9xL/tSFj2ZcWBwHDRYlpKvzup/k/x7Bj9JnV4BbAKObjkz
 mv4DCs5R5tGAodT1CyFZn0V6sJ4yLNZpOWjSrHQtkORhXvatkq+XIQvq/OJOHkDT98
 /J74pcsxZFoN3WLCiUWbqU3iN1nLOjL3BaAeHHqWHU+EJhrvpcrzjGvGjB9tIDxANC
 9eqniFc0LCAtMdrDY4lEk0uolo2w3RYc98RqYkyKMitvXvpmEMaZd4FIPIMI13D8/I
 Pw1oMJ0vV7jxKjFZxC69AXb/4YwbsUo1yZcum0XbbnMRWcbNt4h/1ygXBW5u6Nh7E8
 /gr6TVGvyYcQMvT0b1ZLhqQvM3LHJsZChQqQ4LENFHx1YEyIiRkMF0NswWV1wOQs74
 zTsPTopIrPJ51715fU/ANC8iAwLGzYN3qlEArf6lcGIP5eg3TWGD9Y+/2w/BgTKggB
 WrWar/J1JLuQDZeirdC/RdyGR7P5owm0fkyoD8fx3UMvtQwSK0mdrSjwI23PgeRpet
 QfjuXyhZSJNukeesmR7pl5D2euqP872EAZ5jbeBqkKgnLcnqjBuXUV+z4tNbjY4xTD
 Hp9PkuBmdi2hAxZqoNCEJ87MNPw3hKbEdTlAhfzNP4fm6oMeTEyxx8HxHGlqc6ksTN
 e8tXOz6i1VyEF4xpVjJekdSs=
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden
X-Spam-Level: 
X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED
 autolearn=ham autolearn_force=no version=3.4.6
Received: from localhost (unknown [146.70.134.132])
 by wolfsden.cz (Postfix) with ESMTPSA id EB9AE31D844;
 Sun,  6 Oct 2024 15:15:30 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
 t=1728227731; bh=ppHqUBAGIWel1tWhl8rRmEZuQRQjcPp1DUvvy2oKHLE=;
 h=From:To:Cc:Subject:Date;
 b=jz3gw3wph7XOyKq/8yQ9xL/tSFj2ZcWBwHDRYlpKvzup/k/x7Bj9JnV4BbAKObjkz
 mv4DCs5R5tGAodT1CyFZn0V6sJ4yLNZpOWjSrHQtkORhXvatkq+XIQvq/OJOHkDT98
 /J74pcsxZFoN3WLCiUWbqU3iN1nLOjL3BaAeHHqWHU+EJhrvpcrzjGvGjB9tIDxANC
 9eqniFc0LCAtMdrDY4lEk0uolo2w3RYc98RqYkyKMitvXvpmEMaZd4FIPIMI13D8/I
 Pw1oMJ0vV7jxKjFZxC69AXb/4YwbsUo1yZcum0XbbnMRWcbNt4h/1ygXBW5u6Nh7E8
 /gr6TVGvyYcQMvT0b1ZLhqQvM3LHJsZChQqQ4LENFHx1YEyIiRkMF0NswWV1wOQs74
 zTsPTopIrPJ51715fU/ANC8iAwLGzYN3qlEArf6lcGIP5eg3TWGD9Y+/2w/BgTKggB
 WrWar/J1JLuQDZeirdC/RdyGR7P5owm0fkyoD8fx3UMvtQwSK0mdrSjwI23PgeRpet
 QfjuXyhZSJNukeesmR7pl5D2euqP872EAZ5jbeBqkKgnLcnqjBuXUV+z4tNbjY4xTD
 Hp9PkuBmdi2hAxZqoNCEJ87MNPw3hKbEdTlAhfzNP4fm6oMeTEyxx8HxHGlqc6ksTN
 e8tXOz6i1VyEF4xpVjJekdSs=
From: Tomas Volf <~@wolfsden.cz>
To: 71981 <at> debbugs.gnu.org
Subject: [PATCH v2] services: configuration: Produce doc even if
 package->symbol fails.
Date: Sun,  6 Oct 2024 17:14:40 +0200
Message-ID: <f15912833621ab6263dc1d9d10f40d8d380b9c8a.1728227680.git.~@wolfsden.cz>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71981
Cc: Tomas Volf <~@wolfsden.cz>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Due to #71979 it can happen that package->symbol can return #f even for
packages that are defined in modules on the load patch and which were
previously loaded and set as a default value.

In that case we can just return (package-name val), since for the purpose of
illustrating the default value in the documentation the name should suffice.
And having (possibly) slightly misleading documentation property is still
better then `guix pull' just failing due to passing #f to symbol->string.

* gnu/services/configuration.scm (generate-documentation)[package?]: Fall back
to package-name if package->symbol fails.

Change-Id: I9987caf40d3ff62a52cbd6e3325aa42c69a6c47a
---
Rebase on latest master.

 gnu/services/configuration.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
index d2b1687496..a0e6fe206f 100644
--- a/gnu/services/configuration.scm
+++ b/gnu/services/configuration.scm
@@ -445,7 +445,14 @@ (define (generate-documentation documentation documentation-name)
                    (define (show-default val)
                      (cond
                       ((package? val)
-                       (symbol->string (package->symbol val)))
+                       (let ((sym (package->symbol val)))
+                         ;; Work around for #71979.  While in the alternate
+                         ;; the answer will not always match the symbol, it
+                         ;; should be good enough for illustrating the default
+                         ;; value in documentation.
+                         (if sym
+                             (symbol->string sym)
+                             (package-name val))))
                       (((list-of package?) val)
                        (format #f "(~{~a~^ ~})" (map package->symbol val)))
                       (else (str val))))
--
2.46.0
Information forwarded to guix-patches@HIDDEN:
bug#71981; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 7 Jul 2024 17:28:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jul 07 13:28:06 2024
Received: from localhost ([127.0.0.1]:49094 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sQVgE-0005dR-00
	for submit <at> debbugs.gnu.org; Sun, 07 Jul 2024 13:28:06 -0400
Received: from lists.gnu.org ([209.51.188.17]:39698)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <~@wolfsden.cz>) id 1sQVgC-0005dH-Eg
 for submit <at> debbugs.gnu.org; Sun, 07 Jul 2024 13:28:04 -0400
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 <~@wolfsden.cz>) id 1sQVg7-0000au-RM
 for guix-patches@HIDDEN; Sun, 07 Jul 2024 13:27:59 -0400
Received: from wolfsden.cz ([37.205.8.62])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1sQVg5-0006Zs-P9
 for guix-patches@HIDDEN; Sun, 07 Jul 2024 13:27:59 -0400
Received: by wolfsden.cz (Postfix, from userid 104)
 id C54BF8B7E; Sun,  7 Jul 2024 17:27:54 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
 t=1720373274; bh=juxeQ/ELR3w/qvaBdCykHMPOO9XhtuF6Dr4AFa3Xg+I=;
 h=From:To:Cc:Subject:Date;
 b=Ha/vuMfaeRezMKSAuljrfqrwu8TgEx7gVRCX2W2ro0cDLOLo0bjT7iDo5HjEUiXe9
 XgE6w886DPpykTACD9NoSlaketSvG7F6F5NP2k61IaUciU8+uj1SZaVm1R8+sWR6FB
 G2JPQ76zhBLbTx+ZlvrErNSGZV33CTJn4YNWN5GF0UYSs0Keqk2Iq9EFuUqBVgrdii
 KYGR4nA+Bgiw4sPN9ooNUep4ww31BmYjr+AKxbqfJiYdXBP28iMe9C53Ga5FPs/iXc
 EAQnmXG/ZM4Pe+XYbDfPv67TB2GD9kdGfoRWs13tBF0oM6+r/nUaVjIBk3/gZUxiwn
 imzkH+26/G/zUwIRz5mR0+/swxCMZVeOAJ7ZkdNGLqdapwpVLps+O+LSzX4SfRR9eT
 srrxV/3jdwvjEjeihsbbZLjb9kpEpTNlZJY/OcFQTOe3kgMXJeCfNla79q9vjpu0Iu
 IQJN614KpJCUDrsh0pRKfR4TV1qcE0kL3Q0cjM+QqjNd2YfoxG0infUka7BXn9U6AP
 IGIVnKE4g9+SnyKhtt3hOhWvceRNFpvDTr8fT1D1jcxuUMjrYKMbycDHgVkCl+TcHe
 8PC/FrJ95XeR2b/LbtTqhEUQkCkRTrxC2YXC80DBuHcQRdI+2FWqwLUwC/CuwpWWXX
 a1kZaOATcUGk+zxLGOaa8geg=
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden
X-Spam-Level: 
X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED,
 DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED
 autolearn=unavailable autolearn_force=no version=3.4.6
Received: from localhost (unknown [128.0.188.242])
 by wolfsden.cz (Postfix) with ESMTPSA id 0397E91EA;
 Sun,  7 Jul 2024 17:27:54 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
 t=1720373274; bh=juxeQ/ELR3w/qvaBdCykHMPOO9XhtuF6Dr4AFa3Xg+I=;
 h=From:To:Cc:Subject:Date;
 b=Ha/vuMfaeRezMKSAuljrfqrwu8TgEx7gVRCX2W2ro0cDLOLo0bjT7iDo5HjEUiXe9
 XgE6w886DPpykTACD9NoSlaketSvG7F6F5NP2k61IaUciU8+uj1SZaVm1R8+sWR6FB
 G2JPQ76zhBLbTx+ZlvrErNSGZV33CTJn4YNWN5GF0UYSs0Keqk2Iq9EFuUqBVgrdii
 KYGR4nA+Bgiw4sPN9ooNUep4ww31BmYjr+AKxbqfJiYdXBP28iMe9C53Ga5FPs/iXc
 EAQnmXG/ZM4Pe+XYbDfPv67TB2GD9kdGfoRWs13tBF0oM6+r/nUaVjIBk3/gZUxiwn
 imzkH+26/G/zUwIRz5mR0+/swxCMZVeOAJ7ZkdNGLqdapwpVLps+O+LSzX4SfRR9eT
 srrxV/3jdwvjEjeihsbbZLjb9kpEpTNlZJY/OcFQTOe3kgMXJeCfNla79q9vjpu0Iu
 IQJN614KpJCUDrsh0pRKfR4TV1qcE0kL3Q0cjM+QqjNd2YfoxG0infUka7BXn9U6AP
 IGIVnKE4g9+SnyKhtt3hOhWvceRNFpvDTr8fT1D1jcxuUMjrYKMbycDHgVkCl+TcHe
 8PC/FrJ95XeR2b/LbtTqhEUQkCkRTrxC2YXC80DBuHcQRdI+2FWqwLUwC/CuwpWWXX
 a1kZaOATcUGk+zxLGOaa8geg=
From: Tomas Volf <~@wolfsden.cz>
To: guix-patches@HIDDEN
Subject: [PATCH] services: configuration: Produce doc even if package->symbol
 fails.
Date: Sun,  7 Jul 2024 19:27:47 +0200
Message-ID: <53d2860103fbb103f902c3783724d44717be16d0.1720373267.git.~@wolfsden.cz>
X-Mailer: git-send-email 2.45.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz;
 helo=wolfsden.cz
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: Tomas Volf <~@wolfsden.cz>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

Due to #71979 it can happen that package->symbol can return #f even for
packages that are defined in modules on the load patch and which were
previously loaded and set as a default value.

In that case we can just return (package-name val), since for the purpose of
illustrating the default value in the documentation the name should suffice.
And having (possibly) slightly misleading documentation property is still
better then `guix pull' just failing due to passing #f to symbol->string.

* gnu/services/configuration.scm (generate-documentation)[package?]: Fall back
to package-name if package->symbol fails.

Change-Id: I9987caf40d3ff62a52cbd6e3325aa42c69a6c47a
---
 gnu/services/configuration.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
index d2b1687496..a0e6fe206f 100644
--- a/gnu/services/configuration.scm
+++ b/gnu/services/configuration.scm
@@ -445,7 +445,14 @@ (define (generate-documentation documentation documentation-name)
                    (define (show-default val)
                      (cond
                       ((package? val)
-                       (symbol->string (package->symbol val)))
+                       (let ((sym (package->symbol val)))
+                         ;; Work around for #71979.  While in the alternate
+                         ;; the answer will not always match the symbol, it
+                         ;; should be good enough for illustrating the default
+                         ;; value in documentation.
+                         (if sym
+                             (symbol->string sym)
+                             (package-name val))))
                       (((list-of package?) val)
                        (format #f "(~{~a~^ ~})" (map package->symbol val)))
                       (else (str val))))
-- 
2.45.1
Acknowledgement sent to Tomas Volf <~@wolfsden.cz>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#71981; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sun, 12 Jan 2025 05:45:02 UTC

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