From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BD6489D9BB for ; Mon, 5 Jun 2023 17:43:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A4C6D2A4B0 for ; Mon, 5 Jun 2023 17:43:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 5 Jun 2023 17:43:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4748E48AA3 for ; Mon, 5 Jun 2023 17:43:22 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 5 Jun 2023 17:43:09 +0200 Message-Id: <20230605154313.181289-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230605154313.181289-1-f.ebner@proxmox.com> References: <20230605154313.181289-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.048 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH widget-toolkit 1/5] apt repositories: actually ignore ignore-pre-upgrade-warning X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jun 2023 15:43:23 -0000 when upgrading is possible rather than throwing an error by reaching the else branch. Signed-off-by: Fiona Ebner --- src/node/APTRepositories.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/node/APTRepositories.js b/src/node/APTRepositories.js index 1fb627c..cb08bb6 100644 --- a/src/node/APTRepositories.js +++ b/src/node/APTRepositories.js @@ -654,10 +654,12 @@ Ext.define('Proxmox.node.APTRepositories', { if (info.kind === 'origin') { infos[path][idx].origin = info.message; - } else if (info.kind === 'warning' || - (info.kind === 'ignore-pre-upgrade-warning' && !repoGrid.majorUpgradeAllowed) - ) { + } else if (info.kind === 'warning') { infos[path][idx].warnings.push(info); + } else if (info.kind === 'ignore-pre-upgrade-warning') { + if (!repoGrid.majorUpgradeAllowed) { + infos[path][idx].warnings.push(info); + } } else { throw 'unknown info'; } -- 2.39.2