From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 83C081FF187 for ; Tue, 18 Nov 2025 23:02:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C89101ECF1; Tue, 18 Nov 2025 23:01:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lchholdings-org.20230601.gappssmtp.com; s=20230601; t=1763503289; x=1764108089; darn=lists.proxmox.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zwqdSy+H4aoysr4sXJV5HdIwkuOdR6E6gcqc48iwLTE=; b=N8CXF3P+t0CcQBiR0Y7rSjE8wvKEMGGlX/vTnwBFmVv6qOaKJBs88qulhaNeQ4rbhP wPwQGwiwjBcA3Owc3nOwEWM9aoz3+sz2swdCpRFPRflHJjMUV37v/mq/scxVa8B3WHzb jdjm7UjQcalHLJuSGPwljfcaQl3fnjo9JS0UpczJdNaXm19vtvJ9DDsA94EZL8Sl3WpT z37ThK3Vqi7gOFsrGdLApf2N+YwTai98HGyZxIvlRdtZevs/lRPHDkCjJBqmum2uenxY E38VKsnKAYofHFVuiAPqeJESWLpvjPOkcokTfbxIBhFXOupRs1cKOmpe7ryw/YLGuw/7 AS0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763503289; x=1764108089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zwqdSy+H4aoysr4sXJV5HdIwkuOdR6E6gcqc48iwLTE=; b=AKaD+xREhus+qyBdcWjz70l6X4svUUvFJJgVKjoIphblCWO0uGzdne96ZTgK7FsoyV BcxrsBjZt/EHWEoQTmq/nh65YVG7noAokGj3K/dP3s0I8AkfOeUTuoEnAJxWrqwMNeDc cDyFxy7KMWKbXEFXLtwNQ6hkPQlMUNXgV82waLEacmbETafk92W5X+nwqfG8oqwJCxQN gN5IWJ1O2u4WuQml4wy5YE+d2IFrDwoDHoDvB7b7jY+D+lfQWxbvCHuSNSlrx2XLGLyz ENDlomRcndady3Y1VfqDXqXm9UmEvAK6XyPfM+d0fPcqOG/FLRLzeujDhw1e8k3/1eI7 ie3A== X-Gm-Message-State: AOJu0Yy37DLxc6HVb6DTz+TFu2X7F0VObo+R2VhfxqGXQA6wEtgSR0vB EShYzkMnju6YQVJpsG49xfFuK5uAqPgNtHGw4vxhRvmyI4IE1ZptatzBxT1Etz2we9yGrU3aLlD 3g1d6JT4/wtMicfzc2rkh9ibMUxiZtpk32akXoew8y0hpJQs9DHE2hs1ZTaazkMPQcqAtCTBZNc 8L2vbhIYb4FJDxIt29PM61m3A0mZfcYfGmpYZ/kRbcZI7zB/GDjE3uduH2lWZSyLw5NStXD8e1n NpgtOOmnnLh X-Gm-Gg: ASbGncvWUhranXfngZGP/7LDZCBirFK9sFvVUE7Dhl+mGBQXTHMseohhcI9bV+5gmct CPJvrvGsUOyh7Gnr/h1zSogv1J7txFhH/MgT0186vFbzeR0Wkt18m/RT47q9yieYWBhqRO6W2/R 4696bsPELrqY4uY1YgZkuJiqUSzMJ8nbjmQs+NnZhCfaSMM8Xk0XIUrTUqQ8evKHADHL7YM6UEE ljirteT+fgShSV+wmq28tc1JA73sdOHQaM9oEJn8R6/FbPjbe+R5dM0qkfS4N8FMXZhlnaBKqjk BQJUEcpv4XpLprb/eR2nRw5cetCz3Gksy7x3UT4SngMvOjciTEs9ASZfNwbvBhdX+VRAp6gvrXH 8cvtNOI9zbkvnMsM8p/ZXrAVnUivWBGx2OXPr9MkZT8QEkUSRYQKO4md32P1EhZDiQei5Rbow5w == X-Google-Smtp-Source: AGHT+IG0w4J+uHFbz07k1t+S/At12e5dA4r9vRJYqEKTR4nPmiUVsJReG49BQtiJags7cJ0Iu8Nbw0hIleWx X-Received: by 2002:a05:690c:fcd:b0:786:6467:23f0 with SMTP id 00721157ae682-78929f04177mr171328577b3.64.1763503289084; Tue, 18 Nov 2025 14:01:29 -0800 (PST) X-Relaying-Domain: lukeh990.io From: Luke Harding To: pve-devel@lists.proxmox.com Date: Tue, 18 Nov 2025 17:01:19 -0500 Message-ID: <20251118220122.61257-5-luke@lukeh990.io> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251118220122.61257-1-luke@lukeh990.io> References: <20251118220122.61257-1-luke@lukeh990.io> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DMARC_MISSING 0.1 Missing DMARC policy RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH dab 4/7] Change closure algorithm to use an alternate package if the most preferred candidate fails. 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: , Reply-To: Proxmox VE development discussion Cc: Luke Harding Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Luke Harding --- PVE/DAB.pm | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/PVE/DAB.pm b/PVE/DAB.pm index da117c0..8b93c1b 100644 --- a/PVE/DAB.pm +++ b/PVE/DAB.pm @@ -1207,19 +1207,30 @@ sub __closure_single { } } # search for non-excluded alternative - my $found; + my $success; foreach my $p1 (@l1) { - if ($p1 =~ m/^\s*(\S+).*/) { - next if grep { $1 eq $_ } @$excl; - $found = $1; - last; - } + next unless $p1 =~ /^\s*(\S+)/; + my $candidate = $1; + + next if grep { $candidate eq $_ } @$excl; + + #print STDERR "$pname: trying $candidate for '$p'\n"; + + my $ok = eval { + __closure_single($pkginfo, $closure, $pkghash, $pkglist, $candidate, $excl); + 1; + }; + + if ($ok) { + $success = 1; + last; + } else { + print STDERR "$pname: $candidate failed, trying next alternative...\n"; + } } - die "package '$pname' depends on exclusion '$p'\n" if !$found; - #printf (STDERR "$pname: $p --> $found\n"); - - __closure_single ($pkginfo, $closure, $pkghash, $pkglist, $found, $excl); + die "package '$pname' could not satisfy dependency '$p' (all alternatives failed)\n" + unless $success; } } -- 2.52.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel