summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-19 11:38:45 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-19 11:38:45 +0000
commitbfe37c13141bc718a42c0d8b8c3bbff03bfc5ff2 (patch)
treed485b3c253e2a1b2cc3c32b6243eb426f695d3ea /perl-install/install_steps_interactive.pm
parenta672385d6e1ae6b19e7181aaa5767e31f7e669ef (diff)
downloaddrakx-bfe37c13141bc718a42c0d8b8c3bbff03bfc5ff2.tar
drakx-bfe37c13141bc718a42c0d8b8c3bbff03bfc5ff2.tar.gz
drakx-bfe37c13141bc718a42c0d8b8c3bbff03bfc5ff2.tar.bz2
drakx-bfe37c13141bc718a42c0d8b8c3bbff03bfc5ff2.tar.xz
drakx-bfe37c13141bc718a42c0d8b8c3bbff03bfc5ff2.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a0567d5f1..803638f5f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -250,16 +250,16 @@ sub installPackages {
my $w = $o->wait_message(_("Installing"), _("Preparing installation"));
- my $old = \&log::ld;
- local *log::ld = sub {
+ my $old = \&pkgs::installCallback;
+ local *pkgs::installCallback = sub {
my $m = shift;
- if ($m =~ /^starting installation:/) {
+ if ($m =~ /^Starting installation/) {
$total = $_[2];
- } elsif ($m =~ /^starting installing/) {
+ } elsif ($m =~ /^Starting installing package/) {
my $name = $_[0];
$w->set(_("Installing package %s\n%d%%", $name, 100 * $current / $total));
$current += c::headerGetEntry($o->{packages}{$name}{header}, 'size');
- } else { goto $old }
+ } else { unshift @_, $m; goto $old }
};
$o->SUPER::installPackages($packages);
}