aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
Diffstat (limited to 'Rpmdrake')
-rwxr-xr-xRpmdrake/pkg.pm70
1 files changed, 35 insertions, 35 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 9476bf20..6808bc49 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -643,44 +643,44 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
++$nok;
++$urpm->{logger_id};
push @errors, @l;
- }
- } else {
- interactive_msg(N("Error"),
- N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l) . "\n\n" .
- N("Try installation without checking dependencies? (y/N) "),
- yesno => 1
- ) or ++$nok, next;
- $urpm->{log}("starting installing packages without deps");
- @l = urpm::install::install($urpm,
- $to_remove,
- \%transaction_sources_install, \%transaction_sources,
- nodeps => 1,
- %install_options_common,
- );
- if (@l) {
- if (!$urpm->{options}{'allow-force'}) {
- ++$nok;
- ++$urpm->{logger_id};
- push @errors, @l;
- } else {
- interactive_msg(N("Error"),
- N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l) . "\n\n" .
- N("Try harder to install (--force)? (y/N) "),
- yesno => 1
- ) or ++$nok, next;
- $urpm->{log}("starting force installing packages without deps");
- @l = urpm::install::install($urpm,
- $to_remove,
- \%transaction_sources_install, \%transaction_sources,
- nodeps => 1, force => 1,
- %install_options_common,
- );
- if (@l) {
- #- Warning : the following message is parsed in urpm::parallel_*
- print N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l), "\n";
+ } else {
+ interactive_msg(N("Error"),
+ N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l) . "\n\n" .
+ N("Try installation without checking dependencies? (y/N) "),
+ yesno => 1
+ ) or ++$nok, next;
+ $urpm->{log}("starting installing packages without deps");
+ @l = urpm::install::install($urpm,
+ $to_remove,
+ \%transaction_sources_install, \%transaction_sources,
+ nodeps => 1,
+ %install_options_common,
+ );
+ if (@l) {
+ if (!$urpm->{options}{'allow-force'}) {
++$nok;
++$urpm->{logger_id};
push @errors, @l;
+ } else {
+ interactive_msg(N("Error"),
+ N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l) . "\n\n" .
+ N("Try harder to install (--force)? (y/N) "),
+ yesno => 1
+ ) or ++$nok, next;
+ $urpm->{log}("starting force installing packages without deps");
+ @l = urpm::install::install($urpm,
+ $to_remove,
+ \%transaction_sources_install, \%transaction_sources,
+ nodeps => 1, force => 1,
+ %install_options_common,
+ );
+ if (@l) {
+ #- Warning : the following message is parsed in urpm::parallel_*
+ print N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l), "\n";
+ ++$nok;
+ ++$urpm->{logger_id};
+ push @errors, @l;
+ }
}
}
}