summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-08 14:28:46 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-08 14:28:46 +0000
commitd1b1a87df13793d692a7d19167692624e207e9c2 (patch)
tree71c25685389a88522def3ab61d17a6f0441d224a /perl-install/install
parenta98516cd29c1a810ba39345e847590618913fa8c (diff)
downloaddrakx-d1b1a87df13793d692a7d19167692624e207e9c2.tar
drakx-d1b1a87df13793d692a7d19167692624e207e9c2.tar.gz
drakx-d1b1a87df13793d692a7d19167692624e207e9c2.tar.bz2
drakx-d1b1a87df13793d692a7d19167692624e207e9c2.tar.xz
drakx-d1b1a87df13793d692a7d19167692624e207e9c2.zip
(installPackages) continue installing if an advertising image is corrupted (#37674)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_gtk.pm5
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 081942f43..6ce8a9957 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- continue installing if an advertising image is corrupted (#37674)
+
Version 11.68 - 3 October 2008
- final logo
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 6ad982603..0546a12e8 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -543,7 +543,10 @@ sub installPackages {
$change_time = time();
my $f = $install::any::advertising_images[$i++ % @install::any::advertising_images];
log::l("advertising $f");
- gtkval_modify(\$advertising_image, $f);
+ eval { gtkval_modify(\$advertising_image, $f) };
+ if (my $err = $@) {
+ log::l("cannot load advertising image:\n" . formatError($err));
+ }
if (my $banner = $w->{window}{banner}) {
my ($title);