summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-09-04 18:21:13 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-09-04 18:21:13 +0000
commitb0ef9167ce9e8170174b2c9f952e1e143214bb4b (patch)
treece5160f334bfcd1adbefc9e67ff30f62e30466e1 /perl-install
parent490a8132ecb4cb6df70aded07932ccc201f96320 (diff)
downloaddrakx-b0ef9167ce9e8170174b2c9f952e1e143214bb4b.tar
drakx-b0ef9167ce9e8170174b2c9f952e1e143214bb4b.tar.gz
drakx-b0ef9167ce9e8170174b2c9f952e1e143214bb4b.tar.bz2
drakx-b0ef9167ce9e8170174b2c9f952e1e143214bb4b.tar.xz
drakx-b0ef9167ce9e8170174b2c9f952e1e143214bb4b.zip
Abort scannerdrake when SANE packages cannot be installed.
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/scannerdrake13
1 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 47e01ed82..679a34641 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -39,10 +39,15 @@ my $in = 'interactive'->vnew('su');
if (!files_exist('/usr/bin/scanimage',
'/usr/bin/xsane',
if_(files_exist("/usr/bin/gimp"),
- "/usr/lib/gimp/*/plug-ins/xsane"))) {
- $in->do_pkgs->install('sane-backends', 'xsane',
- if_($in->do_pkgs->is_installed('gimp'),
- 'xsane-gimp'));
+ "/usr/lib/gimp/1.2/plug-ins/xsane"))) {
+ if (!$in->do_pkgs->install('sane-backends', 'xsane',
+ if_($in->do_pkgs->is_installed('gimp'),
+ 'xsane-gimp'))) {
+ $in->ask_warn(N("Scannerdrake"),
+ N("Could not install the packages needed to set up a scanner with Scannerdrake.") . " " .
+ N("Scannerdrake will not be started now."));
+ exit 0;
+ }
}
if ($::Manual) { manual(); quit() }
my $wait = $in->wait_message(N("Scannerdrake"),