From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9C2B91FF170 for ; Tue, 19 Nov 2024 09:39:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 64AD51D1D4; Tue, 19 Nov 2024 09:40:02 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 19 Nov 2024 09:39:56 +0100 Message-Id: <20241119083958.513287-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241119083958.513287-1-d.csapak@proxmox.com> References: <20241119083958.513287-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 qemu-server 1/1] api: import working storage: improve error message 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" the ui and api talks about 'import working storage' but the error here still said 'for extraction'. Improve the message by unifiying the wording and adding the storage name to it too. Signed-off-by: Dominik Csapak --- PVE/API2/Qemu.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 01ad167a..53ff7092 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -178,14 +178,15 @@ my $check_storage_access = sub { ? PVE::Storage::storage_config($storecfg, $extraction_storage) : $scfg; my $extraction_param = defined($extraction_storage) ? 'import-working-storage' : $ds; + my $extraction_id = $extraction_storage // $storeid; if (!$extraction_scfg->{content}->{images} || !$extraction_scfg->{path}) { raise_param_exc({ - $extraction_param => "storage selected for extraction does not support" + $extraction_param => "import working storage '$extraction_id' does not support" ." 'images' content type or is not file based.", }); } - $rpcenv->check($authuser, "/storage/" . ($extraction_storage // $storeid), ['Datastore.AllocateSpace']); + $rpcenv->check($authuser, "/storage/$extraction_id", ['Datastore.AllocateSpace']); } } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel