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 330A375365 for ; Wed, 21 Apr 2021 15:29:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 28CCAFE80 for ; Wed, 21 Apr 2021 15:29:07 +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 1871EFE6C for ; Wed, 21 Apr 2021 15:29:05 +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 44521462FF for ; Wed, 21 Apr 2021 15:19:54 +0200 (CEST) Date: Wed, 21 Apr 2021 15:19:43 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210421111539.29261-1-s.reiter@proxmox.com> <20210421111539.29261-5-s.reiter@proxmox.com> In-Reply-To: <<20210421111539.29261-5-s.reiter@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1619007307.tr64kjpdso.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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, proxmox.com] Subject: Re: [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 13:29:07 -0000 On April 21, 2021 1:15 pm, Stefan Reiter wrote: > 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. >=20 > Signed-off-by: Stefan Reiter > --- > src/PVE/PBSClient.pm | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) >=20 > 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 =3D { > 'upload-log' =3D> 1, > }; > =20 > -my sub do_raw_client_cmd { > +my sub run_raw_client_cmd { > my ($self, $client_cmd, $param, %opts) =3D @_; > =20 > my $use_crypto =3D $USE_CRYPT_PARAMS->{$client_cmd}; > @@ -185,12 +185,11 @@ my sub do_raw_client_cmd { > $logfunc->("run: " . join(' ', @$cmd)); > } > =20 > - run_command($cmd, %opts); > -} > - > -my sub run_raw_client_cmd { > - my ($self, $client_cmd, $param, %opts) =3D @_; > - return do_raw_client_cmd($self, $client_cmd, $param, %opts); > + if(my $startcmd =3D delete $opts{startcmd}) { > + return $startcmd->($cmd, %opts); > + } else { > + return run_command($cmd, %opts); I am not sure why this is needed? the only user for this has a=20 $startcmd that is just a wrapper around run_command with options set, so=20 it could just as well just pass these options to run_raw_client_cmd? > + } > } > =20 > my sub run_client_cmd { > @@ -206,7 +205,7 @@ my sub run_client_cmd { > =20 > $param =3D [@$param, '--output-format=3Djson'] if !$no_output; > =20 > - do_raw_client_cmd( > + run_raw_client_cmd( > $self, > $client_cmd, > $param, > --=20 > 2.20.1 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20 =