[kernel] r18934 - dists/sid/linux-2.6/debian/lib/python/debian_linux

[Ben Hutchings]

Author: benh
Date: Mon Apr 16 05:00:41 2012
New Revision: 18934

Log:
Fix parsing of WHENCE file listing multiple binary files in a group

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

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/firmware.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/firmware.py	Mon Apr 16 03:53:18 2012	(r18933)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/firmware.py	Mon Apr 16 05:00:41 2012	(r18934)
@@ -25,7 +25,7 @@
         driver = None
         files = {}
         licence = None
-        binary = None
+        binary = []
         desc = None
         source = []
         version = None
@@ -48,9 +48,13 @@
 
             if line == '\n':
                 # End of field; end of file fields
-                if binary:
-                    files[binary] = FirmwareFile(binary, desc, source, version)
-                binary = None
+                for b in binary:
+                    # XXX The WHENCE file isn't yet consistent in its
+                    # association of binaries and their sources and
+                    # metadata.  This associates all sources and
+                    # metadata in a group with each binary.
+                    files[b] = FirmwareFile(b, desc, source, version)
+                binary = []
                 desc = None
                 source = []
                 version = None
@@ -66,7 +70,7 @@
                     driver = value.split(' ')[0].lower()
                 elif keyword == 'File':
                     match = re.match(r'(\S+)(?:\s+--\s+(.*))?', value)
-                    binary = match.group(1)
+                    binary.append(match.group(1))
                     desc = match.group(2)
                 elif keyword in ['Info', 'Version']:
                     version = value
@@ -79,7 +83,7 @@
                            re.sub(r'^(?:[/ ]\*| \*/)?\s*(.*?)\s*$', r'\1', line))
 
         # Finish last section if non-empty
-        if binary:
-            files[binary] = FirmwareFile(binary, desc, source, version)
+        for b in binary:
+            files[b] = FirmwareFile(b, desc, source, version)
         if driver:
             self.append(FirmwareSection(driver, files, licence))