summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiago Salem Herrmann <salem@mandriva.com.br>2008-03-10 19:16:00 +0000
committerTiago Salem Herrmann <salem@mandriva.com.br>2008-03-10 19:16:00 +0000
commit2c4f1afb1d3b9f7235dab7860ed37af47ebeefcd (patch)
treeed7994c355a8acee54f68e8abd7dd577d18ffe07
parentaa2f3a78b1ec53d3e8f78bb286bcbc64d73e0f04 (diff)
downloaddrakx-2c4f1afb1d3b9f7235dab7860ed37af47ebeefcd.tar
drakx-2c4f1afb1d3b9f7235dab7860ed37af47ebeefcd.tar.gz
drakx-2c4f1afb1d3b9f7235dab7860ed37af47ebeefcd.tar.bz2
drakx-2c4f1afb1d3b9f7235dab7860ed37af47ebeefcd.tar.xz
drakx-2c4f1afb1d3b9f7235dab7860ed37af47ebeefcd.zip
- Fix to scanner.pm open usbtable.gz instead of usbtable.
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/scanner.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c6c8452ac..108ccc1bf 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- diskdrake:
o really fix partition device name for some dmraid (missing "p", cf #38363)
- cpufreq: fix gsx-suspmod probe
+- scannerdrake: fix to open usbtable.gz instead of usbtable
Version 10.10 - 6 March 2008
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index 0d9015eec..dd42cbb7e 100644
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -290,7 +290,7 @@ sub detect {
# We have vendor and product ID, look up the scanner in
# the usbtable
- foreach my $entry (cat_("$scannerDBdir/usbtable")) {
+ foreach my $entry (common::catMaybeCompressed("$scannerDBdir/usbtable")) {
if ($entry =~
/^\s*$vendorid\s+$productid\s+.*\"([^\"]+)\"\s*$/) {
$description = $1;