diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-03-02 13:46:50 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-03-02 13:46:50 +0000 |
| commit | 1760cfe15b2b778eb9d2adeae2df3c3336c728fa (patch) | |
| tree | 3fc4e55ea35d740912a2c8a1101e9dcfa6eae3aa /Rpmdrake | |
| parent | e54c0b5dacb10b493dd8e130d2a74c05d4f29a90 (diff) | |
| download | rpmdrake-1760cfe15b2b778eb9d2adeae2df3c3336c728fa.tar rpmdrake-1760cfe15b2b778eb9d2adeae2df3c3336c728fa.tar.gz rpmdrake-1760cfe15b2b778eb9d2adeae2df3c3336c728fa.tar.bz2 rpmdrake-1760cfe15b2b778eb9d2adeae2df3c3336c728fa.tar.xz rpmdrake-1760cfe15b2b778eb9d2adeae2df3c3336c728fa.zip | |
fix allow-nodeps handling
Diffstat (limited to 'Rpmdrake')
| -rwxr-xr-x | Rpmdrake/pkg.pm | 70 |
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; + } } } } |