diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-09-02 10:59:49 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-09-02 10:59:49 +0000 |
| commit | 5785b2ca6b6359efc044782c9ad5f589d0b5b14a (patch) | |
| tree | 715076cbbaf48da8bd340825ab03eefe6c3dea64 | |
| parent | c3b9336d935188f5f518f51a1eaf9e1cbc9ea946 (diff) | |
| download | drakx-backup-do-not-use-5785b2ca6b6359efc044782c9ad5f589d0b5b14a.tar drakx-backup-do-not-use-5785b2ca6b6359efc044782c9ad5f589d0b5b14a.tar.gz drakx-backup-do-not-use-5785b2ca6b6359efc044782c9ad5f589d0b5b14a.tar.bz2 drakx-backup-do-not-use-5785b2ca6b6359efc044782c9ad5f589d0b5b14a.tar.xz drakx-backup-do-not-use-5785b2ca6b6359efc044782c9ad5f589d0b5b14a.zip | |
cleanup
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 526df652e..c72da9270 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -494,7 +494,7 @@ sub installPackages { $advertize->(0); local *install_steps::installCallback = sub { - my ($data, $type, $id, $subtype, $amount, $total) = @_; + my ($packages, $type, $id, $subtype, $amount, $total) = @_; if ($type eq 'user' && $subtype eq 'install') { #- $amount and $total are used to return number of package and total size. $nb = $amount; @@ -504,7 +504,7 @@ sub installPackages { $w->flush; } elsif ($type eq 'inst' && $subtype eq 'start') { gtkval_modify(\$pkg_progress, 0); - my $p = $data->{depslist}[$id]; + my $p = $packages->{depslist}[$id]; mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, (split /\n/, c::from_utf8($p->summary))[0] || '')); $current_total_size += $last_size; $last_size = $p->size; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index f6aafcd86..cd73e1749 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -710,11 +710,11 @@ sub installPackages { my $w = $o->wait_message(N("Installing"), N("Preparing installation")); local *install_steps::installCallback = sub { - my ($data, $type, $id, $subtype, $_amount, $total_) = @_; + my ($packages, $type, $id, $subtype, $_amount, $total_) = @_; if ($type eq 'user' && $subtype eq 'install') { $total = $total_; } elsif ($type eq 'inst' && $subtype eq 'start') { - my $p = $data->{depslist}[$id]; + my $p = $packages->{depslist}[$id]; $w->set(N("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total)); $current += $p->size; } |