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 8DFBD751F6 for ; Wed, 21 Apr 2021 13:24:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E823AE0B6 for ; Wed, 21 Apr 2021 13:24:00 +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 E946BDFD6 for ; Wed, 21 Apr 2021 13:23:55 +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 70E60461FF for ; Wed, 21 Apr 2021 13:15:45 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Wed, 21 Apr 2021 13:15:31 +0200 Message-Id: <20210421111539.29261-3-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210421111539.29261-1-s.reiter@proxmox.com> References: <20210421111539.29261-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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. [pbsclient.pm] Subject: [pve-devel] [PATCH common 02/10] PBSClient: allow running other binaries 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: Wed, 21 Apr 2021 11:24:01 -0000 ...such as proxmox-file-restore. Signed-off-by: Stefan Reiter --- Fixes indentation where "binary =>" is added. src/PVE/PBSClient.pm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index f05471c..857cff0 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -139,8 +139,9 @@ my sub do_raw_client_cmd { my $use_crypto = $USE_CRYPT_PARAMS->{$client_cmd}; - my $client_exe = '/usr/bin/proxmox-backup-client'; - die "executable not found '$client_exe'! Proxmox backup client not installed?\n" + my $client_exe = (delete $opts{binary}) || 'proxmox-backup-client'; + $client_exe = "/usr/bin/$client_exe"; + die "executable not found '$client_exe'! Proxmox backup client or file restore not installed?\n" if ! -x $client_exe; my $scfg = $self->{scfg}; @@ -193,22 +194,25 @@ my sub run_raw_client_cmd { } my sub run_client_cmd { - my ($self, $client_cmd, $param, $no_output) = @_; + my ($self, $client_cmd, $param, $no_output, $binary) = @_; my $json_str = ''; my $outfunc = sub { $json_str .= "$_[0]\n" }; + $binary //= 'proxmox-backup-client'; + $param = [] if !defined($param); $param = [ $param ] if !ref($param); $param = [@$param, '--output-format=json'] if !$no_output; do_raw_client_cmd( - $self, - $client_cmd, - $param, - outfunc => $outfunc, - errmsg => 'proxmox-backup-client failed' + $self, + $client_cmd, + $param, + outfunc => $outfunc, + errmsg => "$binary failed", + binary => $binary, ); return undef if $no_output; -- 2.20.1