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 6C8F1751F5 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 D102BE0B5 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 ECD35DFD9 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 9C65D4623D 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:33 +0200 Message-Id: <20210421111539.29261-5-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 04/10] PBSClient: allow different command execution callback 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 do_raw_client_cmd gains a parameter which it calls instead of run_command at the end. While at it, rename it to run_raw_client_cmd, as the current run_raw_client_cmd simply calls do_raw_client_cmd anyway. Signed-off-by: Stefan Reiter --- src/PVE/PBSClient.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index c3bfab7..f6b46b2 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -134,7 +134,7 @@ my $USE_CRYPT_PARAMS = { 'upload-log' => 1, }; -my sub do_raw_client_cmd { +my sub run_raw_client_cmd { my ($self, $client_cmd, $param, %opts) = @_; my $use_crypto = $USE_CRYPT_PARAMS->{$client_cmd}; @@ -185,12 +185,11 @@ my sub do_raw_client_cmd { $logfunc->("run: " . join(' ', @$cmd)); } - run_command($cmd, %opts); -} - -my sub run_raw_client_cmd { - my ($self, $client_cmd, $param, %opts) = @_; - return do_raw_client_cmd($self, $client_cmd, $param, %opts); + if(my $startcmd = delete $opts{startcmd}) { + return $startcmd->($cmd, %opts); + } else { + return run_command($cmd, %opts); + } } my sub run_client_cmd { @@ -206,7 +205,7 @@ my sub run_client_cmd { $param = [@$param, '--output-format=json'] if !$no_output; - do_raw_client_cmd( + run_raw_client_cmd( $self, $client_cmd, $param, -- 2.20.1