From 00f909e65833ea8ef73bf4a02b0dd8d7623636d6 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 26 Sep 2012 19:12:44 +0000
Subject: (message_input_) rename it as message_input()

---
 urpmi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'urpmi')

diff --git a/urpmi b/urpmi
index 26312f38..94ded6fa 100755
--- a/urpmi
+++ b/urpmi
@@ -439,7 +439,7 @@ sub ask_choice {
 	print N("In order to satisfy the '%s' dependency, one of the following packages is needed:", $virtual_pkg_name), "\n";
 	my $i = 0;
 	foreach (@l) { print " " . ++$i . "- $_\n" }
-	$n = message_input_(N("What is your choice? (1-%d) ", $i), default => $prefer, range_min => 0, range => $i);
+	$n = message_input(N("What is your choice? (1-%d) ", $i), default => $prefer, range_min => 0, range => $i);
 	defined($n) && $n ne "0" or exit 1; # abort.
 	if ($n =~ /\D/) {
 	    my @nn = map { $choices[$_ - 1] } grep { !/\D/ } split /[, \t]+/, $n;
@@ -490,7 +490,7 @@ that are older than the installed ones:\n%s", $list);
     } else {
 	my $noexpr = N("Nn");
 	$msg .= N("\nContinue installation anyway?");
-	$force || message_input_($msg . N(" (Y/n) "), boolean => 1) !~ /[$noexpr]/ or exit 17;
+	$force || message_input($msg . N(" (Y/n) "), boolean => 1) !~ /[$noexpr]/ or exit 17;
     }
     # Whatever option we selected, the overall installation should fail if some packages are unselected
     $urpm::postponed_msg .= $msg . "\n";
@@ -508,7 +508,7 @@ if (@ask_unselect) {
     } else {
 	my $noexpr = N("Nn");
 	$msg .= N("\nContinue installation anyway?");
-	$force || message_input_($msg . N(" (Y/n) "), boolean => 1) !~ /[$noexpr]/ or exit 17;
+	$force || message_input($msg . N(" (Y/n) "), boolean => 1) !~ /[$noexpr]/ or exit 17;
     }
     # Whatever option we selected, the overall installation should fail if some packages are unselected
     $urpm::postponed_msg .= $msg . "\n";
@@ -623,7 +623,7 @@ if (!$urpm->{options}{auto} && $ask_user && $urpm->{nb_install} || $env && !$opt
 	exit 0; #- exit now for specific environment.
     }
     my $noexpr = N("Nn");
-    $force || message_input_($p . N(" (Y/n) "), boolean => 1) !~ /[$noexpr]/ or exit 17;
+    $force || message_input($p . N(" (Y/n) "), boolean => 1) !~ /[$noexpr]/ or exit 17;
 }
 
 my $exit_code = urpm::main_loop::run($urpm, $state, 
@@ -637,7 +637,7 @@ my $exit_code = urpm::main_loop::run($urpm, $state,
 	    1;
 	} else {
 	    my $msg2 = N("Press Enter when mounted...");
-	    defined message_input_("$msg\n$msg2 ");
+	    defined message_input("$msg\n$msg2 ");
 	}
     }) : ()),
     trans_log => &urpm::download::sync_logger,
-- 
cgit v1.2.1