From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 255631FF17E for ; Thu, 18 Sep 2025 15:52:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7B8F6E2E; Thu, 18 Sep 2025 15:52:52 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 18 Sep 2025 15:50:55 +0200 Message-ID: <20250918135215.95188-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250918135215.95188-1-f.ebner@proxmox.com> References: <20250918135215.95188-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758203529644 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.022 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 Subject: [pve-devel] [PATCH manager 3/4] partially fix #2077: remove dependency on Term::ReadLine 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" As a side-effect, this also fixes #6748. Originally-by: Stefan Hrdlicka [FE: rebase and adapt to rename] Signed-off-by: Fiona Ebner --- Dependency bump for pve-common needed. PVE/CLI/pvenode.pm | 19 +++++++------------ debian/control | 1 - 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/PVE/CLI/pvenode.pm b/PVE/CLI/pvenode.pm index 76b05887..7f717642 100644 --- a/PVE/CLI/pvenode.pm +++ b/PVE/CLI/pvenode.pm @@ -21,8 +21,7 @@ use PVE::RPCEnvironment; use PVE::CLIFormatter; use PVE::RESTHandler; use PVE::CLIHandler; - -use Term::ReadLine; +use PVE::PTY; use base qw(PVE::CLIHandler); @@ -108,13 +107,12 @@ __PACKAGE__->register_method({ } print $i, ") Custom\n"; - my $term = Term::ReadLine->new('pvenode'); my $get_dir_selection = sub { - my $selection = $term->readline("Enter selection: "); + my $selection = PVE::PTY::read_line("Enter selection: "); if ($selection =~ /^(\d+)$/) { $selection = $1; if ($selection == $i) { - $param->{directory} = $term->readline("Enter custom URL: "); + $param->{directory} = PVE::PTY::read_line("Enter custom URL: "); $custom_directory = 1; return; } elsif ($selection < $i && $selection >= 0) { @@ -137,8 +135,7 @@ __PACKAGE__->register_method({ if ($meta->{termsOfService}) { my $tos = $meta->{termsOfService}; print "Terms of Service: $tos\n"; - my $term = Term::ReadLine->new('pvenode'); - my $agreed = $term->readline('Do you agree to the above terms? [y|N]: '); + my $agreed = PVE::PTY::read_line('Do you agree to the above terms? [y|N]: '); die "Cannot continue without agreeing to ToS, aborting.\n" if ($agreed !~ /^y$/i); @@ -149,18 +146,16 @@ __PACKAGE__->register_method({ my $eab_enabled = $meta->{externalAccountRequired}; if (!$eab_enabled && $custom_directory) { - my $term = Term::ReadLine->new('pvenode'); my $agreed = - $term->readline('Do you want to use external account binding? [y|N]: '); + PVE::PTY::read_line('Do you want to use external account binding? [y|N]: '); $eab_enabled = ($agreed =~ /^y$/i); } elsif ($eab_enabled) { print "The CA requires external account binding.\n"; } if ($eab_enabled) { print "You should have received a key id and a key from your CA.\n"; - my $term = Term::ReadLine->new('pvenode'); - my $eab_kid = $term->readline('Enter EAB key id: '); - my $eab_hmac_key = $term->readline('Enter EAB key: '); + my $eab_kid = PVE::PTY::read_line('Enter EAB key id: '); + my $eab_hmac_key = PVE::PTY::read_line('Enter EAB key: '); $param->{'eab-kid'} = $eab_kid; $param->{'eab-hmac-key'} = $eab_hmac_key; diff --git a/debian/control b/debian/control index 64b942ce..4d589beb 100644 --- a/debian/control +++ b/debian/control @@ -70,7 +70,6 @@ Depends: apt (>= 1.5~), libpve-storage-perl (>= 9.0.5), librados2-perl (>= 1.3-1), libtemplate-perl, - libterm-readline-gnu-perl, liburi-perl, libuuid-perl, libwww-perl (>= 6.04-1), -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel