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 4EC77A19A8 for ; Thu, 15 Jun 2023 15:23:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3609C275D5 for ; Thu, 15 Jun 2023 15:22:50 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 15 Jun 2023 15:22:49 +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 4C1F445849 for ; Thu, 15 Jun 2023 15:22:49 +0200 (CEST) From: Friedrich Weber To: pve-devel@lists.proxmox.com Date: Thu, 15 Jun 2023 15:22:31 +0200 Message-Id: <20230615132231.702195-1-f.weber@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.340 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, pve7to8.pm] Subject: [pve-devel] [PATCH manager stable-7] pve7to8: content-dirs check: skip paths that cannot be resolved 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: Thu, 15 Jun 2023 13:23:20 -0000 The current inequality check for content-dirs does not correctly handle the case in which `abs_path` returns undef. This can result in confusing warnings: storage [...] uses directory for multiple content types [...] Fix this by skipping paths for which `abs_path` returns undef. This matches the behavior of the actual content-dirs check in PVE 8 [0]. [0]: https://git.proxmox.com/?p=pve-storage.git;a=commit;h=09f1f847a Fixes: ea0a4f1943ffafe94282afc800d5720db45df198 Signed-off-by: Friedrich Weber --- PVE/CLI/pve7to8.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm index d8624ca7..22a477a5 100644 --- a/PVE/CLI/pve7to8.pm +++ b/PVE/CLI/pve7to8.pm @@ -986,6 +986,7 @@ sub check_storage_content_dirs { my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); for my $vtype (keys $scfg->{content}->%*) { my $abs_subdir = Cwd::abs_path($plugin->get_subdir($scfg, $vtype)); + next if !defined($abs_subdir); push $resolved_subdirs->{$abs_subdir}->@*, $vtype; } for my $subdir (keys $resolved_subdirs->%*) { -- 2.39.2