- call installCallback() on "open" too

- on "open" we are not chrooted
- setting advertising when chrooted could cause havoc
  if pango wants to load a new font (eg: advertising #13 in pt_BR)

2 files changed, 3 insertions, 2 deletions

diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 73369e4f4..864f1f6dc 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -442,7 +442,6 @@ sub installPackages {
 	
 	$change_time = time();
 	my $f = $install_any::advertising_images[$i++ % @install_any::advertising_images];
-	$f =~ s/\Q$::prefix// if ! -f $f;
 	log::l("advertising $f");
 	gtkval_modify(\$advertising_image, $f);
 
@@ -502,7 +501,7 @@ sub installPackages {
 	    $start_time = time();
 	    mygtk2::gtkadd($pkg_log_widget, text => N("%d packages", $nb));
 	    $w->flush;
-	} elsif ($type eq 'inst' && $subtype eq 'start') {
+	} elsif ($type eq 'open') {
 	    gtkval_modify(\$pkg_progress, 0);
 	    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] || ''));
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 72d041a50..4af37f4d1 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1148,6 +1148,7 @@ sub install {
 		    my $fd; #- since we return the "fileno", perl does not know we're still using it, and so closes it, and :-(
 		    my @probs = $trans->run($packages, force => 1, nosize => 1, callback_open => sub {
 						my ($packages, $_type, $id) = @_;
+						&$callback;
 						my $pkg = defined $id && $packages->{depslist}[$id];
 						my $medium = packageMedium($packages, $pkg);
 						my $f = $pkg && $pkg->filename;
@@ -1160,6 +1161,7 @@ sub install {
 						$fd ? fileno $fd : -1;
 					    }, callback_close => sub {
 						my ($packages, $_type, $id) = @_;
+						&$callback;
 						my $pkg = defined $id && $packages->{depslist}[$id] or return;
 						my $check_installed;
 						$db->traverse_tag('name', [ $pkg->name ], sub {