summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-05-15 07:41:18 +0000
committerThierry Vignaud <tv@mageia.org>2013-05-15 07:41:18 +0000
commit0176bf3a8580492ae0692413979e2dca033e87e7 (patch)
tree6a3b5be5bfa4d6142f3b2532c114bf5474b86732
parent16741a51a2959446a38d40136324822659f752da (diff)
downloaddrakx-0176bf3a8580492ae0692413979e2dca033e87e7.tar
drakx-0176bf3a8580492ae0692413979e2dca033e87e7.tar.gz
drakx-0176bf3a8580492ae0692413979e2dca033e87e7.tar.bz2
drakx-0176bf3a8580492ae0692413979e2dca033e87e7.tar.xz
drakx-0176bf3a8580492ae0692413979e2dca033e87e7.zip
fix displaying release notes while installing (mga#10087)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_gtk.pm12
2 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 002715a2f..f94e0e6f2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix displaying release notes while installing (mga#10087)
+
Version 15.51 - 13 May 2013
- any.pm: dont add arch() to release-notes file name (#10087)
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 77796072f..1e715d0a8 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -632,12 +632,6 @@ sub installPackages {
$w->flush;
} elsif ($type eq 'open') {
$advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20;
- } elsif ($type eq 'inst' && $subtype eq 'start') {
- gtkval_modify(\$pkg_progress, 0);
- my $p = $packages->{depslist}[$id];
- mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, translate($p->summary)));
- $current_total_size += $last_size;
- $last_size = $p->size;
# display release notes if requested, when not chrooted:
if ($show_release_notes) {
@@ -645,6 +639,12 @@ sub installPackages {
any::run_display_release_notes($release_notes);
$w->flush;
}
+ } elsif ($type eq 'inst' && $subtype eq 'start') {
+ gtkval_modify(\$pkg_progress, 0);
+ my $p = $packages->{depslist}[$id];
+ mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, translate($p->summary)));
+ $current_total_size += $last_size;
+ $last_size = $p->size;
$w->flush;
} elsif ($type eq 'inst' && $subtype eq 'progress') {