diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-08-31 11:12:08 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-08-31 11:12:08 +0000 |
commit | ff238ca275243f27db6ac8d1511c5b8544186b1d (patch) | |
tree | 5555c83233b63058690d9178480984d0816fddb0 /perl-install/install_steps_interactive.pm | |
parent | f964bbafe8f28c2204097382a5542bce9aab79d8 (diff) | |
download | drakx-ff238ca275243f27db6ac8d1511c5b8544186b1d.tar drakx-ff238ca275243f27db6ac8d1511c5b8544186b1d.tar.gz drakx-ff238ca275243f27db6ac8d1511c5b8544186b1d.tar.bz2 drakx-ff238ca275243f27db6ac8d1511c5b8544186b1d.tar.xz drakx-ff238ca275243f27db6ac8d1511c5b8544186b1d.zip |
instead of dirtying pkgs::installCallback, use install_steps::installCallback
(still not clean, but better)
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r-- | perl-install/install_steps_interactive.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 49fbcdca9..2fcddce05 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -712,8 +712,7 @@ sub installPackages { my $w = $o->wait_message(N("Installing"), N("Preparing installation")); - my $old = \&pkgs::installCallback; - local *pkgs::installCallback = sub { + local *install_steps::installCallback = sub { my ($data, $type, $id, $subtype, $_amount, $total_) = @_; if ($type eq 'user' && $subtype eq 'install') { $total = $total_; @@ -721,7 +720,7 @@ sub installPackages { my $p = $data->{depslist}[$id]; $w->set(N("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total)); $current += $p->size; - } else { goto $old } + } }; #- the modification is not local as the box should be living for other package installation. |