[kernel] r18432 - dists/trunk/linux-2.6/debian/lib/python/debian_linux

[Ben Hutchings]

Author: benh
Date: Thu Dec 29 18:28:04 2011
New Revision: 18432

Log:
Update firmware WHENCE file parsing

All File fields now describe just one file, which may be followed by
other related fields.  Never flush the file details immediately.

For some File fields, there are now multiple following Source fields.
Collect them in a list.

Modified:
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/firmware.py

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/firmware.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/firmware.py	Thu Dec 29 18:10:14 2011	(r18431)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/firmware.py	Thu Dec 29 18:28:04 2011	(r18432)
@@ -24,7 +24,7 @@
         licence = None
         binary = None
         desc = None
-        source = None
+        source = []
         version = None
 
         for line in file:
@@ -49,7 +49,7 @@
                     files[binary] = FirmwareFile(binary, desc, source, version)
                 binary = None
                 desc = None
-                source = None
+                source = []
                 version = None
                 continue
 
@@ -62,18 +62,13 @@
                 if keyword == 'Driver':
                     driver = value.split(' ')[0].lower()
                 elif keyword == 'File':
-                    match = re.match(r'(\S+)\s+--\s+(.*)', value)
-                    if match:
-                        binary = match.group(1)
-                        desc = match.group(2)
-                    else:
-                        for binary in value.strip().split():
-                            files[binary] = FirmwareFile(binary)
-                        binary = None
+                    match = re.match(r'(\S+)(?:\s+--\s+(.*))?', value)
+                    binary = match.group(1)
+                    desc = match.group(2)
                 elif keyword in ['Info', 'Version']:
                     version = value
                 elif keyword == 'Source':
-                    source = value
+                    source.append(value)
                 else:
                     licence = value
             elif licence is not None: