summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-08-04 05:02:17 +0000
committerOlivier Blin <oblin@mandriva.org>2005-08-04 05:02:17 +0000
commitad47fddb99b751abecdde91eab13120800c9b445 (patch)
tree3f3da775bfaf49536d5fa46b971d42998fbaed29
parent955dc2828451b68164b152a20bf2335b64b2e96a (diff)
downloaddrakx-ad47fddb99b751abecdde91eab13120800c9b445.tar
drakx-ad47fddb99b751abecdde91eab13120800c9b445.tar.gz
drakx-ad47fddb99b751abecdde91eab13120800c9b445.tar.bz2
drakx-ad47fddb99b751abecdde91eab13120800c9b445.tar.xz
drakx-ad47fddb99b751abecdde91eab13120800c9b445.zip
make sure jpegtopnm is available (thanks to Anne Nicolas)
-rwxr-xr-xperl-install/standalone/draksplash8
1 files changed, 2 insertions, 6 deletions
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index 5f3f4980c..02341004c 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -10,12 +10,8 @@ use bootsplash;
my $in = 'interactive'->vnew('su');
-#- verification of package image magik
-unless ($in->do_pkgs->ensure_is_installed('ImageMagick', '/usr/bin/convert')) {
- $in->ask_okcancel(N("Error"), N("package 'ImageMagick' is required to be able to complete configuration.\nClick \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"))
- && $in->do_pkgs->install('ImageMagick')
- or close_all();
-}
+$in->do_pkgs->ensure_is_installed('ImageMagick', '/usr/bin/convert') or close_all();
+$in->do_pkgs->ensure_is_installed('netpbm', '/usr/bin/jpegtopnm') or close_all();
my $window = ugtk2->new('DrakSplash');
$window->{rwindow}->signal_connect(delete_event => \&close_all);