X-Loop: help-debbugs@HIDDEN Subject: [bug#71981] [PATCH] services: configuration: Produce doc even if package->symbol fails. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 07 Jul 2024 17:29:02 +0000 Resent-Message-ID: <handler.71981.B.172037328621670 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 71981 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71981 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.172037328621670 (code B ref -1); Sun, 07 Jul 2024 17:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jul 2024 17:28:06 +0000 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> 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-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
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Tomas Volf <~@wolfsden.cz> Subject: bug#71981: Acknowledgement ([PATCH] services: configuration: Produce doc even if package->symbol fails.) Message-ID: <handler.71981.B.172037328621670.ack <at> debbugs.gnu.org> References: <53d2860103fbb103f902c3783724d44717be16d0.1720373267.git.~@wolfsden.cz> X-Gnu-PR-Message: ack 71981 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 71981 <at> debbugs.gnu.org Date: Sun, 07 Jul 2024 17:29:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 71981 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 71981: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71981 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#71981] [PATCH v2] services: configuration: Produce doc even if package->symbol fails. References: <53d2860103fbb103f902c3783724d44717be16d0.1720373267.git.~@wolfsden.cz> In-Reply-To: <53d2860103fbb103f902c3783724d44717be16d0.1720373267.git.~@wolfsden.cz> Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 15:16:02 +0000 Resent-Message-ID: <handler.71981.B71981.172822774428183 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 71981 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71981 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 71981-submit <at> debbugs.gnu.org id=B71981.172822774428183 (code B ref 71981); Sun, 06 Oct 2024 15:16:02 +0000 Received: (at 71981) by debbugs.gnu.org; 6 Oct 2024 15:15:44 +0000 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> 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-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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.