Hello community,
here is the log from the commit of package pciutils-ids for openSUSE:Factory
checked in at 2013-11-29 21:24:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pciutils-ids (Old)
and /work/SRC/openSUSE:Factory/.pciutils-ids.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pciutils-ids"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pciutils-ids/pciutils-ids.changes
2013-10-18 11:41:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pciutils-ids.new/pciutils-ids.changes
2013-11-29 21:24:15.000000000 +0100
@@ -1,0 +2,16 @@
+Tue Nov 26 17:41:47 CET 2013 - jdelv...@suse.de
+
+- merge-pciids.pl: Preserve all comments and blank lines. The
+ original code considered blank lines as hard seperators and this
+ resulted in some comments being lost or put in the wrong place.
+- merge-pciids.pl: Better handling of input files. The original
+ code was trying to be smart and generic but as a result it was
+ unable to deal with slight pci.ids format variations, in
+ particular the number of spaces before the device or class name.
+ Intel network drivers do have such variations, which lspci itself
+ handles just fine.
+- merge-pciids.pl: Handle arbitrary case in vendor, device and
+ class ID. Lspci supports upper-case so merge-pciids.pl should
+ handle that properly.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ merge-pciids.pl ++++++
--- /var/tmp/diff_new_pack.7teoPJ/_old 2013-11-29 21:24:16.000000000 +0100
+++ /var/tmp/diff_new_pack.7teoPJ/_new 2013-11-29 21:24:16.000000000 +0100
@@ -6,6 +6,7 @@
# solution of the same problem.
#
# (c) 2007 Martin Mares <m...@ucw.cz>, GPLv2
+# (c) 2013 Jean Delvare <jdelv...@suse.de>
use strict;
@@ -16,28 +17,39 @@
open F, $fn or die "Unable to open $file: $!";
my @id = ();
my $comm = "";
+ my $class = 0;
sub err($) {
print STDERR "Error in $file, line $.: @_\n";
exit 1;
}
while (<F>) {
- if (/^(#.*)/) {
+ if (/^(#.*|\s*$)/) {
$comm .= $_;
next;
}
chomp;
- if (my ($indent, $id, $ignored, $name) = /^(\t*)(([0-9a-fA-Z]+
?)*)(( |\t|$)\s*(.*))$/) {
+ if (/^(\t|C\s+|)([0-9a-fA-F]+)\s+(.*)$/ ||
+ (!$class && /^(\t\t)([0-9a-fA-F]+\s+[0-9a-fA-F]+)\s+(.*)$/)
||
+ ($class && /^(\t\t)([0-9a-fA-F]+)\s+(.*)$/)) {
+ my $indent = $1;
+ my $id = lc($2);
+ my $name = $3;
+ if ($indent =~ /^C\s+$/) {
+ $indent = "";
+ $id = "C $id";
+ }
my $depth = length $indent;
$depth <= @id or err "Mismatched indentation";
@id = (@id[0..$depth-1], $id);
+ $class = ($id =~ /^C\s/) if !$depth; #
Remember if we are in a vendor or a class section
my $i = join(":", @id);
- my $j = ($i =~ /[A-Z] /) ? "~$i" : $i; # We
want to sort special entries last
+ my $j = $class ? "~$i" : $i; # We
want to sort special entries last
if (exists $ids{$j} && $ids{$j} ne $name) {
print STDERR "Warning: ID $i has two different
definitions, using the one from $file\n";
}
$ids{$j} = $name;
$comments{$j} = $comm if $comm;
- } elsif (!/^$/) {
+ } else {
err "Parse error";
}
$comm = "";
@@ -53,5 +65,5 @@
$j =~ s/.*://g;
$j =~ s/^~//;
print $comments{$id} if $comments{$id};
- print "$i$j$ids{$id}\n";
+ print "$i$j $ids{$id}\n";
}
++++++ pci.ids.bz2 ++++++
++++ 816 lines (skipped)
++++ between pci.ids.bz2
++++ and /work/SRC/openSUSE:Factory/.pciutils-ids.new/pci.ids.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
