diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2004-03-01 14:47:19 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2004-03-01 14:47:19 +0000 |
| commit | 4bd0efc9df913ed36e7c4d489638e5e9f549ea16 (patch) | |
| tree | a8e0bae133472a62663273337c1951290452dc08 /perl-install/standalone | |
| parent | e30a9a7df53233d466e1ed5ff9f98a7644828909 (diff) | |
| download | drakx-4bd0efc9df913ed36e7c4d489638e5e9f549ea16.tar drakx-4bd0efc9df913ed36e7c4d489638e5e9f549ea16.tar.gz drakx-4bd0efc9df913ed36e7c4d489638e5e9f549ea16.tar.bz2 drakx-4bd0efc9df913ed36e7c4d489638e5e9f549ea16.tar.xz drakx-4bd0efc9df913ed36e7c4d489638e5e9f549ea16.zip | |
Fixed bug #7242: Firmware was not found by "gt68xx" SANE backend.
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/scannerdrake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index adc167bc2..3ddedfe14 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -165,7 +165,7 @@ sub dynamic() { } sub installfirmware { - my ($model) = @_; + my ($model, $backend) = @_; my $firmware; my $choice = N("Do not install firmware file"); while (1) { @@ -204,7 +204,7 @@ sub installfirmware { } # Install the firmware file in /usr/share/sane/firmware - $firmware = scanner::installfirmware($firmware); + $firmware = scanner::installfirmware($firmware, $backend); return $firmware; } @@ -266,7 +266,7 @@ sub updatefirmware { return 0 if !$firmware; # Install the firmware file in /usr/share/sane/firmware - $firmware = scanner::installfirmware($firmware); + $firmware = scanner::installfirmware($firmware, $_->{val}{BACKEND}); # Enter the path to the firmware in the appropriate config file foreach (@configured) { @@ -367,7 +367,8 @@ sub tryConfScanner { ($vendor, $product) = scanner::get_usb_ids_for_port($port); my $firmware; if (grep { /FIRMWARELINE/ } @{$scanner::scannerDB->{$model}{lines}} ) { - $firmware = installfirmware($model); + $firmware = installfirmware($model, + $scanner::scannerDB->{$model}{server}); return 0 if $firmware eq "///"; } scanner::confScanner($model, $port, $vendor, $product, $firmware); |