diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-08-17 06:26:05 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-08-17 06:26:05 +0000 |
| commit | 65905fd8ff735e47d6759c242ab4ded5ab58c6ae (patch) | |
| tree | 5fcb1ad13c2f823fb7828eca79abf01ea20b0314 /perl-install/install_steps_gtk.pm | |
| parent | 280af206e4f0206017b7e6fb2ba1304fe1a96853 (diff) | |
| download | drakx-backup-do-not-use-65905fd8ff735e47d6759c242ab4ded5ab58c6ae.tar drakx-backup-do-not-use-65905fd8ff735e47d6759c242ab4ded5ab58c6ae.tar.gz drakx-backup-do-not-use-65905fd8ff735e47d6759c242ab4ded5ab58c6ae.tar.bz2 drakx-backup-do-not-use-65905fd8ff735e47d6759c242ab4ded5ab58c6ae.tar.xz drakx-backup-do-not-use-65905fd8ff735e47d6759c242ab4ded5ab58c6ae.zip | |
don't fork anymore to install rpms
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 34787a591..46ac85247 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -439,7 +439,7 @@ sub installPackages { ugtk2::gtkadd($w->{window}, my $box = gtknew('VBox', spacing => 10)); my $advertize = sub { - my ($update) = @_; + my ($update, $o_chroot_dir) = @_; @install_any::advertising_images or return; foreach ($msg, $progress, $text) { $show_advertising ? $_->hide : $_->show; @@ -449,6 +449,7 @@ sub installPackages { if ($show_advertising && $update) { $change_time = time(); my $f = $install_any::advertising_images[$i++ % @install_any::advertising_images]; + $f =~ s/\Q$o_chroot_dir// if $o_chroot_dir; log::l("advertising $f"); my $pl = $f; $pl =~ s/\.png$/.pl/; my $icon_name = $f; $icon_name =~ s/\.png$/_icon.png/; @@ -522,7 +523,7 @@ sub installPackages { $current_total_size += $last_size; $last_size = $p->size; gtkset($text, text => (split /\n/, c::from_utf8($p->summary))[0] || ''); - $advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20; + $advertize->(1, $::prefix) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20; $w->flush; } elsif ($type eq 'inst' && $subtype eq 'progress') { $progress->set_fraction($total ? $amount / $total : 0); |