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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 585838CB6C for ; Fri, 4 Nov 2022 14:23:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2EFEE36E4 for ; Fri, 4 Nov 2022 14:23:48 +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 for ; Fri, 4 Nov 2022 14:23:47 +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 B4E53421DE; Fri, 4 Nov 2022 14:17:18 +0100 (CET) Date: Fri, 4 Nov 2022 14:17:17 +0100 From: Wolfgang Bumiller To: Fabian Ebner Cc: pve-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com Message-ID: <20221104131717.5z24gkavhz5wntvc@casey.proxmox.com> References: <20220720105948.291740-1-f.ebner@proxmox.com> <20220720105948.291740-9-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220720105948.291740-9-f.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.241 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. [filerestore.pm] Subject: [pmg-devel] applied: [RFC/PATCH pve-storage 1/1] api: pbs: file restore: don't use namespaced parameters X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2022 13:23:48 -0000 applied & dumped dependency accordingly On Wed, Jul 20, 2022 at 12:59:48PM +0200, Fabian Ebner wrote: > Instead, rely on PBSClient to set namespace according to the initial > configuration. > > Signed-off-by: Fabian Ebner > --- > > Dependency bump for new libpve-common-perl needed. > > PVE/API2/Storage/FileRestore.pm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/PVE/API2/Storage/FileRestore.pm b/PVE/API2/Storage/FileRestore.pm > index 5630f52..ccc56e5 100644 > --- a/PVE/API2/Storage/FileRestore.pm > +++ b/PVE/API2/Storage/FileRestore.pm > @@ -119,7 +119,7 @@ __PACKAGE__->register_method ({ > my (undef, $snap) = PVE::Storage::parse_volname($cfg, $volid); > > my $client = PVE::PBSClient->new($scfg, $storeid); > - my $ret = $client->file_restore_list([$scfg->{namespace}, $snap], $path, $base64); > + my $ret = $client->file_restore_list($snap, $path, $base64); > > # 'leaf' is a proper JSON boolean, map to perl-y bool > # TODO: make PBSClient decode all bools always as 1/0? > @@ -188,7 +188,7 @@ __PACKAGE__->register_method ({ > $rpcenv->fork_worker('pbs-download', undef, $user, sub { > my $name = decode_base64($path); > print "Starting download of file: $name\n"; > - $client->file_restore_extract($fifo, [$scfg->{namespace}, $snap], $path, 1); > + $client->file_restore_extract($fifo, $snap, $path, 1); > }); > > my $ret = { > -- > 2.30.2