summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm/args.pm4
-rwxr-xr-xurpmi8
2 files changed, 4 insertions, 8 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index d81e28a1..685acd5b 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -56,9 +56,7 @@ my %options_spec = (
'sortmedia|sort-media=s' => \$::sortmedia,
'searchmedia|search-media=s' => \$::searchmedia,
'synthesis=s' => \$::synthesis,
- auto => sub {
- $urpm->{options}{auto} = $::auto = 1;
- },
+ auto => sub { $urpm->{options}{auto} = 1 },
'allow-medium-change' => \$::allow_medium_change,
'auto-select' => \$::auto_select,
'no-remove|no-uninstall' => \$::no_remove,
diff --git a/urpmi b/urpmi
index 82dccd0c..de4589d7 100755
--- a/urpmi
+++ b/urpmi
@@ -347,8 +347,7 @@ sub ask_choice {
} @$choices;
if (@l > 1 && !$urpm->{options}{auto}) {
- my $msg = N("One of the following packages is needed:");
- message($msg);
+ message(N("One of the following packages is needed:"));
my $i = 0; foreach (@l) { message(" " . ++$i . "- $_") }
$n = message_input(N("What is your choice? (1-%d) ", $i), undef, range_min => 0, range => $i);
defined($n) && $n ne "0" or exit 1; # abort.
@@ -414,9 +413,8 @@ if (@ask_remove) {
my $list = join "\n", $urpm->translate_why_removed($state, sort @ask_remove);
if ($no_remove && !$force) {
- my $msg = N("The installation cannot continue because the following packages
-have to be removed for others to be upgraded:\n%s\n", $list);
- message($msg);
+ message(N("The installation cannot continue because the following packages
+have to be removed for others to be upgraded:\n%s\n", $list));
exit 0;
}