summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-26 17:30:31 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-26 17:30:31 +0000
commit7307f870bea8fc184523c8cc0a3f487f236891e4 (patch)
treebed9278431a568ebb41f5618d0815c5bfda41cfe /perl-install
parent3c4d4f8fa24dee3eb6d1756b597e36c5f9e5e0aa (diff)
downloaddrakx-7307f870bea8fc184523c8cc0a3f487f236891e4.tar
drakx-7307f870bea8fc184523c8cc0a3f487f236891e4.tar.gz
drakx-7307f870bea8fc184523c8cc0a3f487f236891e4.tar.bz2
drakx-7307f870bea8fc184523c8cc0a3f487f236891e4.tar.xz
drakx-7307f870bea8fc184523c8cc0a3f487f236891e4.zip
(installCallback) fix doble logging of %(pre|post)trans packages
eg: 'filesystem' which has a %pretrans scriptlet (mga#7758)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_gtk.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 19c414bca..06a274887 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix doble logging of 'filesystem' installation (mga#7758)
+
Version 15.44 - 23 april 2013
- partionning:
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index b6f66f0dc..da6f0b013 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -630,7 +630,7 @@ sub installPackages {
$o->{install_start_time} = 0;
mygtk2::gtkadd($pkg_log_widget, text => P("%d package", "%d packages", $nb, $nb));
$w->flush;
- } elsif ($type eq 'open') {
+ } 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)));