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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5C78860BCF for ; Mon, 7 Feb 2022 10:17:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4A21D2289D for ; Mon, 7 Feb 2022 10:17:28 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 911502288E for ; Mon, 7 Feb 2022 10:17:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5B4E14612E for ; Mon, 7 Feb 2022 10:17:25 +0100 (CET) Message-ID: <09e605a2-f74c-b0e0-eebb-4f824dbdfec0@proxmox.com> Date: Mon, 7 Feb 2022 10:17:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20220203113219.119833-1-f.ebner@proxmox.com> From: Fabian Ebner In-Reply-To: <20220203113219.119833-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.136 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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: Re: [pve-devel] [PATCH manager] api: apt: list_updates: fix dependency detection for virtual package 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, 07 Feb 2022 09:17:58 -0000 Am 03.02.22 um 12:32 schrieb Fabian Ebner: > A virtual package does not have SelectedState Install, but the > dependency will still be satisfied if a package providing it has. > > Fixes a bug, wrongly showing that postfix will be installed, when a > different mail-transport-agent is installed and a pve-manager update > is available: > https://forum.proxmox.com/threads/103413/ > Turns out the same issue is present in PMG and PBS.. I guess the plan is to move the rest of the APT stuff from PBS to proxmox-apt, fix it there and re-use the proxmox-apt implementation everywhere. > Signed-off-by: Fabian Ebner > --- > > Note for testers: the API call uses a cache. > > PVE/API2/APT.pm | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm > index 5344f5e8..dcd87c37 100644 > --- a/PVE/API2/APT.pm > +++ b/PVE/API2/APT.pm > @@ -195,6 +195,13 @@ my $update_pve_pkgstatus = sub { > for my $d (@$deps) { > if ($d->{DepType} eq 'Depends') { > $found = $d->{TargetPkg}->{SelectedState} eq 'Install' if !$found; > + # need to check ProvidesList for virtual packages > + if (!$found && (my $provides = $d->{TargetPkg}->{ProvidesList})) { > + for my $provide ($provides->@*) { > + $found = $provide->{OwnerPkg}->{SelectedState} eq 'Install'; > + last if $found; > + } > + } > $req = $d->{TargetPkg} if !$req; > > if (!($d->{CompType} & AptPkg::Dep::Or)) {