summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2004-05-08 22:56:11 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2004-05-08 22:56:11 +0000
commite651723c5a0a810727e83fa78f2596a44af4b1a9 (patch)
tree5d6ab498deb0396ece878a5b64d2afac5d6f34a1
parent4433486be221da977140b0ba7eb5e28f4a32a0c0 (diff)
downloaddrakx-backup-do-not-use-e651723c5a0a810727e83fa78f2596a44af4b1a9.tar
drakx-backup-do-not-use-e651723c5a0a810727e83fa78f2596a44af4b1a9.tar.gz
drakx-backup-do-not-use-e651723c5a0a810727e83fa78f2596a44af4b1a9.tar.bz2
drakx-backup-do-not-use-e651723c5a0a810727e83fa78f2596a44af4b1a9.tar.xz
drakx-backup-do-not-use-e651723c5a0a810727e83fa78f2596a44af4b1a9.zip
Fixed firmware installation.
-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 03818e79d..0bb42a5b4 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -264,13 +264,18 @@ sub updatefirmware {
return 0 if !$firmware;
- # Install the firmware file in /usr/share/sane/firmware
- $firmware = scanner::installfirmware($firmware, $_->{val}{BACKEND});
-
- # Enter the path to the firmware in the appropriate config file
foreach (@configured) {
next if $_->{val}{DESCRIPTION} ne $scannerchoice;
+ # Install the firmware file in /usr/share/sane/firmware
my $backend = $_->{val}{BACKEND};
+ $firmware = scanner::installfirmware($firmware, $backend);
+ if (!$firmware) {
+ $in->ask_warn('Error',
+ N("Could not install the firmware file for the %s!",
+ $scannerchoice));
+ return 0;
+ }
+ # Enter the path to the firmware in the appropriate config file
my $firmwareline =$_->{val}{FIRMWARELINE};
$firmwareline =~ s/\$FIRMWARE/$firmware/sg;
scanner::setfirmware($backend, $firmwareline);