From 6493b456fb913f8aaa6023325066bd61925fa3e6 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 28 Apr 2009 13:10:22 +0000
Subject: (detect) fix keeping around device as seen by detect_devices for
 frontends (eg: for harddrake)

(why perl_checker didn't found out the variable referenced out of its
scope???)
---
 perl-install/scanner.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/scanner.pm')

diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index 81b9ab3c8..3fa4c9bef 100644
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -263,6 +263,7 @@ sub detect {
     open my $DETECT, "LC_ALL=C sane-find-scanner -q |";
     while (my $line = <$DETECT>) {
 	my ($vendorid, $productid, $make, $model, $description, $port, $driver);
+	my $real_device;
 	if ($line =~ /^\s*found\s+USB\s+scanner/i) {
 	    # Found an USB scanner
 	    if ($line =~ /vendor=(0x[0-9a-f]+)[^0-9a-f\[]+[^\[]*\[([^\[\]]+)\].*prod(|uct)=(0x[0-9a-f]+)[^0-9a-f\[]+[^\[]*\[([^\[\]]+)\]/) {
@@ -284,6 +285,7 @@ sub detect {
 
 		if ($device) {
 		    $driver = $device->{driver};
+		    $real_device = $device
 		} else {
 		    #warn "Failed to lookup $vendorid and $productid!\n";
 		}
@@ -349,7 +351,7 @@ sub detect {
 		id => $productid,
 		vendor => $vendorid,
 		driver => $driver,
-		drakx_device => $device,
+		drakx_device => $real_device,
 	    } 
 	};
     }
-- 
cgit v1.2.1