summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-03 17:14:37 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-03 17:14:37 +0000
commit8be3439b983fd8683b3eaa01624f4b2ace243e70 (patch)
treec4c5ea55f47bda1d8a0ac3a314a1523aa4280ea8
parent6ec5e21f5314c47953e1049764a5062ec7e5d187 (diff)
downloaddrakx-8be3439b983fd8683b3eaa01624f4b2ace243e70.tar
drakx-8be3439b983fd8683b3eaa01624f4b2ace243e70.tar.gz
drakx-8be3439b983fd8683b3eaa01624f4b2ace243e70.tar.bz2
drakx-8be3439b983fd8683b3eaa01624f4b2ace243e70.tar.xz
drakx-8be3439b983fd8683b3eaa01624f4b2ace243e70.zip
(install) plug new 'open_helper' and 'close_helper' urpmi callbacks, thus
fixing both progress bar and trying to install again already installed packages
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/pkgs.pm4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a9557af8d..f0457648e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,7 @@
- set urpmi in automatic mode for non-interactive installs
+- media management & package installation:
+ o do not try to install again already installed packages
+ o fix progress bar
Version 12.0 - 3 March 2009
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 0b546f150..26ba7ba7b 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -730,13 +730,13 @@ sub _install_raw {
log::l("rpm transactions start");
my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, undef, {
- open_unused => sub {
+ open_helper => sub {
my ($packages, $_type, $id) = @_;
&$callback;
my $pkg = defined $id && $packages->{depslist}[$id];
my $medium = packageMedium($packages, $pkg);
print $LOG "$f\n";
- }, close_unused => sub {
+ }, close_helper => sub {
my ($packages, $_type, $id) = @_;
&$callback;
my $pkg = defined $id && $packages->{depslist}[$id] or return;