summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-12-03 10:21:58 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-12-03 10:21:58 +0000
commitfee04c204ed726e8428fdaeea83f9b1dc18478b3 (patch)
tree631d1a7f25f1f91becec4287918c9cbd7d106820
parent5595e8158930e1f7bd55cf9336014b46218fb37c (diff)
downloadldetect-lst-fee04c204ed726e8428fdaeea83f9b1dc18478b3.tar
ldetect-lst-fee04c204ed726e8428fdaeea83f9b1dc18478b3.tar.gz
ldetect-lst-fee04c204ed726e8428fdaeea83f9b1dc18478b3.tar.bz2
ldetect-lst-fee04c204ed726e8428fdaeea83f9b1dc18478b3.tar.xz
ldetect-lst-fee04c204ed726e8428fdaeea83f9b1dc18478b3.zip
overwrite bogus descriptions (aka "vendor|") with proper ones (aka
"vendor|device") from {pci,usb}.ids
-rwxr-xr-xconvert/merge2pcitable.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index dd8ece28..3efb5d51 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -315,7 +315,8 @@ sub merge {
print STDERR "different($drivers->{$_}[0] $new->{$_}[0]): ", to_string($_, $drivers->{$_}), "\n" if $different;
}
}
- $drivers->{$_}[1] ||= $new->{$_}[1];
+ next if !$new->{$_}[1];
+ $drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1] || $drivers->{$_}[1] =~ /\|$/;
} else {
if (!/ffffffff$/ && $new->{$_}[0] eq "unknown") {
# keep sub-entry with major-entry module