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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 06352BA24 for ; Mon, 3 Jul 2023 10:48:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DCC841A59E for ; Mon, 3 Jul 2023 10:48:24 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 3 Jul 2023 10:48:24 +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 2AF14438C0 for ; Mon, 3 Jul 2023 10:48:24 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 3 Jul 2023 10:48:01 +0200 Message-Id: <20230703084801.30822-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.096 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] [PATCH pmg-api] fix #4815: pmgsh: declare rpcenv on top 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: Mon, 03 Jul 2023 08:48:55 -0000 and drop duplicate setup_default_cli_env and initlog invocation Fixes: 1583283557956a431c4afe86d243c6fbc177034b Signed-off-by: Stoiko Ivanov --- quickly tested on my box pmgsh works and sbuild works as well with the patch src/bin/pmgsh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/bin/pmgsh b/src/bin/pmgsh index f9816cd..475e886 100755 --- a/src/bin/pmgsh +++ b/src/bin/pmgsh @@ -37,6 +37,8 @@ sub print_usage { my $disable_proxy = 0; my $opt_nooutput = 0; +my $rpcenv; + my $cmd = shift; my $optmatch; @@ -62,6 +64,7 @@ if ($cmd) { exit 0; } elsif ($cmd =~ /^(?:ls|get|create|set|delete|help)$/) { PMG::RESTEnvironment->setup_default_cli_env(); # only set up once actually required + $rpcenv = PMG::RESTEnvironment->get(); initlog($ENV{PVE_LOG_ID} || 'pmgsh'); pmg_command([ $cmd, @ARGV], $opt_nooutput); exit(0); @@ -76,11 +79,6 @@ if (scalar (@ARGV) != 0) { exit(-1); } -# only set up once actually required allows calling verifyapi in restriced clean sbuild env -PMG::RESTEnvironment->setup_default_cli_env(); -my $rpcenv = PMG::RESTEnvironment->get(); -initlog($ENV{PVE_LOG_ID} || 'pmgsh'); - print "entering PMG shell - type 'help' for help\n"; my $term = new Term::ReadLine('pmgsh'); -- 2.39.2