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 15BE074A26 for ; Tue, 22 Jun 2021 11:19:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E82512478F for ; Tue, 22 Jun 2021 11:19:45 +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 id 812DE2477C for ; Tue, 22 Jun 2021 11:19:45 +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 5A7B44377B for ; Tue, 22 Jun 2021 11:19:45 +0200 (CEST) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Tue, 22 Jun 2021 11:19:16 +0200 Message-Id: <20210622091922.3143130-2-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210622091922.3143130-1-l.stechauner@proxmox.com> References: <20210622091922.3143130-1-l.stechauner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.762 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [aplinfo.pm] Subject: [pve-devel] [PATCH v10 manager 1/4] aplinfo: factoring out regex for vztmpl 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: Tue, 22 Jun 2021 09:19:46 -0000 Signed-off-by: Lorenz Stechauner --- PVE/APLInfo.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PVE/APLInfo.pm b/PVE/APLInfo.pm index 31522ae5..fa991a1b 100644 --- a/PVE/APLInfo.pm +++ b/PVE/APLInfo.pm @@ -8,6 +8,7 @@ use LWP::UserAgent; use POSIX qw(strftime); use PVE::SafeSyslog; +use PVE::Storage; use PVE::Tools qw(run_command); use PVE::pvecfg; @@ -83,7 +84,7 @@ sub read_aplinfo_from_fh { my $template; if ($res->{location}) { $template = $res->{location}; - $template =~ s|.*/([^/]+.tar.[gx]z)$|$1|; + $template =~ s|.*/([^/]+$PVE::Storage::vztmpl_extension_re)$|$1|; if ($res->{location} !~ m|^([a-zA-Z]+)\://|) { # relative localtion (no http:// prefix) $res->{location} = "$source/$res->{location}"; -- 2.30.2