summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-06-26 12:54:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-06-26 12:54:30 +0000
commit11c2e1c497ba6047ccc442bec61262a4ba82da31 (patch)
tree4d13210206f5e3d05f7f70249a24f284a0bc3fd2
parent9b057646f7da47ceccfb46ef6b357972f60c4b1e (diff)
downloadurpmi-11c2e1c497ba6047ccc442bec61262a4ba82da31.tar
urpmi-11c2e1c497ba6047ccc442bec61262a4ba82da31.tar.gz
urpmi-11c2e1c497ba6047ccc442bec61262a4ba82da31.tar.bz2
urpmi-11c2e1c497ba6047ccc442bec61262a4ba82da31.tar.xz
urpmi-11c2e1c497ba6047ccc442bec61262a4ba82da31.zip
cleanup
-rw-r--r--urpm/main_loop.pm13
1 files changed, 7 insertions, 6 deletions
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 6f743746..f3e41411 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -32,7 +32,7 @@ use urpm::util qw(untaint difference2 intersection member partition);
# locking is left to callers
sub run {
- my ($urpm, $state, $something_was_to_be_done, $ask_unselect, $requested, $callbacks) = @_;
+ my ($urpm, $state, $something_was_to_be_done, $ask_unselect, $_requested, $callbacks) = @_;
#- global boolean options
my ($auto_select, $no_install, $install_src, $clean, $noclean, $force, $parallel, $test, $env) =
@@ -290,13 +290,14 @@ if ($nok) {
$callbacks->{success_summary} and $callbacks->{success_summary}->();
if ($something_was_to_be_done || $auto_select) {
if (@{$state->{transaction} || []} == 0 && @$ask_unselect == 0) {
- if ($options{verbose} >= 0) {
- if ($auto_select) {
+ if ($auto_select) {
+ if ($options{verbose} >= 0) {
print N("Packages are up to date"), "\n";
- } else {
+ }
+ } else {
+ if ($callbacks->{already_installed_or_not_installable}) {
my $msg = urpm::select::translate_already_installed($state);
- $callbacks->{already_installed_or_not_installable} and
- $callbacks->{already_installed_or_not_installable}->([$msg], []);
+ $callbacks->{already_installed_or_not_installable}->([$msg], []);
}
}
$exit_code = 15 if our $expect_install;