summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-07 15:20:58 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-07 15:20:58 +0000
commit71841bb57558a93d8bfb7d44ccca31f720dbdb0b (patch)
tree3783a6c01cafec54c65422bf920e1bc4c7827806
parentb7e10ed8a3d06fc103ed1f1a38e30bbb20cb0027 (diff)
downloaddrakx-71841bb57558a93d8bfb7d44ccca31f720dbdb0b.tar
drakx-71841bb57558a93d8bfb7d44ccca31f720dbdb0b.tar.gz
drakx-71841bb57558a93d8bfb7d44ccca31f720dbdb0b.tar.bz2
drakx-71841bb57558a93d8bfb7d44ccca31f720dbdb0b.tar.xz
drakx-71841bb57558a93d8bfb7d44ccca31f720dbdb0b.zip
when device has no description, use vendor string (and do not use defined() as we don't care about empty strings)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f22ac9e71..8900c2a8c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- harddrake:
o list card readers as system components instead of unknows devices
+ o when device has no description, use vendor string
Version 12.24 - 03 April 2009
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index f72ef0e86..e100592d8 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -582,8 +582,8 @@ sub custom_id {
$device->{"Socket Designation"} ?
"$device->{name} (" . $device->{"Socket Designation"} . ")" :
$device->{name} ? $device->{name} :
- (defined($device->{description}) ? $device->{description} :
- (defined($device->{Vendor}) ? $device->{Vendor} : $str)));
+ (($device->{description}) ? $device->{description} :
+ (($device->{Vendor}) ? $device->{Vendor} : $str)));
}
1;