From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 4M79Apr2DGY4GAEA62LTzQ:P1 (envelope-from ) for ; Wed, 03 Apr 2024 08:26:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 4M79Apr2DGY4GAEA62LTzQ (envelope-from ) for ; Wed, 03 Apr 2024 08:26:34 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712125594; a=rsa-sha256; cv=none; b=eetHbCHuCu1qGFHdZhOdVarU5TwCL2jALEUCp7u/4v6PME3MxitCn4WcHtf5xWv9ntJK/d A3kjU0K5mlHRbVRlZkHE5fZxNAXT22bOwu9mGHzqDbtbJbkVgUtPenVRaFM0l53Lp/1end HBqGA7c8o1e4zZY4AEFlzaFfE3csU9H4XA1w863hMPVzcX23ue8jejrLMOy0i5TANfF/57 EzYZC/jSdKuO/ge5vEl5ICn3oNjiDvnefdAPt+3idfz+fWf26ftTHYp6j8jx0bXnav77J6 H73yrA9MeE6qUBEhnsOGGwe6uv3iJR2EYnCVL4lnMr1mdnW8IBhCa1ucgDFz8g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712125594; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Pbr38ARYNRKiuTfhurftHDjjUxAOLbsGNR4++ZBJWaY=; b=g++hfDdwTXvHrXqv9AM2cRbSM9GmtPoGKKKG+fR5FWiHGyvWLyI2y43hsSKrgnBlgbtK2Q bO8AdMXIgK67YCK6Yp9ovLdi8oHCKOY3Gs+9DHZIASb9ELjrUYSKMNqkMfoNMxnOX0AGO/ FJpi97TCqatkpIBgwoNbjE0RHR+0KKudSAcK2v08EO1YkTpjUUBp0BGTpBI7eIkNGVjP9T 6PL8vPWnwEp1Hc1hoDSvvaT8/aFy6YV4tCKlkTv+nrkR9ZeecX/mHyARgilDyeyY5NeZA4 hqwSnouYV1c59HWf8zNP1XuEW1e559vfdaKHyXs95VOGXCRflp5R3GmWG/VPpg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7873C6B1E1 for ; Wed, 3 Apr 2024 08:26:33 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4S-0008T1-Gt; Wed, 03 Apr 2024 02:26: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 ) id 1rru4O-0008SN-VJ for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:00 -0400 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 1rru4O-0005ao-Ia for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rru4S-0004eQ-Jb for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 6/6] gnu: scilab: Improve package management robustness in scilab-cli. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 06:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70158 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70158@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70158-submit@debbugs.gnu.org id=B70158.171212555317775 (code B ref 70158); Wed, 03 Apr 2024 06:26:04 +0000 Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:53 +0000 Received: from localhost ([127.0.0.1]:56854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru4G-0004cd-Um for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:53 -0400 Received: from 11.mo584.mail-out.ovh.net ([46.105.34.195]:41081) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru4B-0004bd-6Y for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:49 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.25.157]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW95r6Tz1CxM for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:41 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-j25md (unknown [10.110.178.91]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9AB0E1FE97; Wed, 3 Apr 2024 06:25:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-j25md with ESMTPSA id GxtfJGX2DGaKEQAAYVxGrA (envelope-from ); Wed, 03 Apr 2024 06:25:41 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:26 +0200 Message-ID: <20240403062528.5483-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240403062528.5483-1-ngraves@ngraves.fr> References: <20240403062528.5483-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 17754597109986288354 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -6.35 X-Migadu-Queue-Id: 7873C6B1E1 X-Migadu-Spam-Score: -6.35 X-Migadu-Scanner: mx10.migadu.com X-TUID: XqC0CgnHWPRw * gnu/packages/maths.scm (scilab)[source]: Improve package management robustness in scilab-cli by allowing tbx_build_help to log the scilab mode incompatibility error and not process the rest of the function instead of failing with it. * gnu/packages/patches/scilab-tbx_build_help.patch : Add patch. Change-Id: I8ee94afb4aba906cbc8c7ca67f4c89aa0cf55ae6 --- gnu/packages/maths.scm | 3 +- .../patches/scilab-tbx_build_help.patch | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/scilab-tbx_build_help.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0d530851b1..1c9a5dcf02 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9718,7 +9718,8 @@ (define-public scilab (sha256 (base32 "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) - (patches (search-patches "scilab-better-compiler-detection.patch")) + (patches (search-patches "scilab-better-compiler-detection.patch" + "scilab-tbx_build_help.patch")) (modules '((guix build utils) (ice-9 ftw))) (snippet diff --git a/gnu/packages/patches/scilab-tbx_build_help.patch b/gnu/packages/patches/scilab-tbx_build_help.patch new file mode 100644 index 0000000000..6e6826d494 --- /dev/null +++ b/gnu/packages/patches/scilab-tbx_build_help.patch @@ -0,0 +1,36 @@ +From c59d78c5a5c8c187450f157cf7f8480455e8e6a2 Mon Sep 17 00:00:00 2001 +From: Nicolas Graves +Date: Wed, 3 Apr 2024 03:32:23 +0200 +Subject: [PATCH] scilab: tbx_build_help: Allow for some flexibility under + -nwni. + +--- + .../modules_manager/macros/tbx_build_help.sci | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/scilab/modules/modules_manager/macros/tbx_build_help.sci b/scilab/modules/modules_manager/macros/tbx_build_help.sci +index 7862e33a868..5593ee3dc04 100644 +--- a/scilab/modules/modules_manager/macros/tbx_build_help.sci ++++ b/scilab/modules/modules_manager/macros/tbx_build_help.sci +@@ -58,12 +58,12 @@ function tbx_build_help(moduletitle, path) + + // Check scilab mode + if and(getscilabmode() <> ["STD" "NW"]) then +- error(msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode())); ++ msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode()); ++ else ++ directory_language = basename(path); ++ default_language = "en_US" ++ ++ xmltojar(path, moduletitle, directory_language, default_language); + end + +- directory_language = basename(path); +- default_language = "en_US" +- +- xmltojar(path, moduletitle, directory_language, default_language); +- + endfunction +-- +2.41.0 + -- 2.41.0