[kernel] r12931 - dists/trunk/firmware-nonfree/debian/bin

[Ben Hutchings]

Author: benh
Date: Sun Feb 22 21:37:35 2009
New Revision: 12931

Log:
Add support for subdirectories of /lib/firmware


Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	(original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Sun Feb 22 21:37:35 2009
@@ -183,9 +183,14 @@
         files_real = {}
 
         for root, dirs, files in os.walk(package):
-            del dirs[:]
+            try:
+                dirs.remove('.svn')
+            except ValueError:
+                pass
             for f in files:
                 f1  = f.rsplit('-', 1)
+                if root != package:
+                    f = root[len(package) + 1 : ] + '/' + f
                 if f in files_orig:
                     files_real[f] = f, f, None
                 elif len(f1) > 1: