diff options
| author | Thierry Vignaud <tv@mageia.org> | 2011-09-17 23:09:33 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2011-09-17 23:09:33 +0000 |
| commit | 35f21dcca1942f7338c6bdd8bb68abcab71ed714 (patch) | |
| tree | 28dcb28f1601c99ad21db0e6de0224e6996d46ac | |
| parent | 794534f38765fac0f3a63b1a274d2ad7ac9b0fc1 (diff) | |
| download | drakx-35f21dcca1942f7338c6bdd8bb68abcab71ed714.tar drakx-35f21dcca1942f7338c6bdd8bb68abcab71ed714.tar.gz drakx-35f21dcca1942f7338c6bdd8bb68abcab71ed714.tar.bz2 drakx-35f21dcca1942f7338c6bdd8bb68abcab71ed714.tar.xz drakx-35f21dcca1942f7338c6bdd8bb68abcab71ed714.zip | |
perl_checker cleanups
| -rw-r--r-- | perl-install/install/pkgs.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 389fffcc7..bfb039690 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -162,7 +162,7 @@ sub _packageRequest { #- check for medium selection, if the medium has not been #- selected, the package cannot be selected. my $medium = packageMedium($packages, $pkg); - $medium and !$medium->{ignore} or return; + $medium && !$medium->{ignore} or return; +{ $pkg->id => 1 }; } @@ -339,7 +339,8 @@ sub empty_packages { $urpm::args::options{force_transactions} = 1; $::force = 1; $packages->{options}{ignoresize} = 1; - $packages->{options}{'priority-upgrade'}; # prevent priority upgrade + # prevent priority upgrade (redundant for now as $urpm->{root} implies disabling it: + $packages->{options}{'priority-upgrade'} = undef; # log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log? $packages->{debug} = \&log::l; @@ -770,8 +771,6 @@ sub _install_raw { # bug present in 2009.0, 2008.1, 2008.0, ... (probably since r11141 aka when switching to rpm-4.2 in URPM-0.83) local $packages->{options}{script_fd} = fileno $LOG; - my ($retry, $retry_count); - log::l("rpm transactions start"); my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, undef, { |