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

[Ben Hutchings]

Author: benh
Date: Wed May 18 04:14:40 2011
New Revision: 17446

Log:
Add symlink names after regular file names in package descriptions

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	Wed May 18 03:49:32 2011	(r17445)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Wed May 18 04:14:40 2011	(r17446)
@@ -213,6 +213,7 @@
         files_orig = config_entry['files']
         files_real = {}
         links = {}
+        links_rev = {}
 
         for root, dirs, files in os.walk(package):
             try:
@@ -226,6 +227,7 @@
                 if os.path.islink(cur_path):
                     if f in files_orig:
                         links[f] = os.readlink(cur_path)
+                        links_rev.setdefault(links[f], []).append(f)
                     continue
                 f1 = f.rsplit('-', 1)
                 if f in files_orig:
@@ -253,6 +255,10 @@
             desc = c.get('desc')
             if version is None:
                 version = c.get('version')
+            try:
+                f = f + ', ' + ', '.join(links_rev[f])
+            except KeyError:
+                pass
             if desc and version:
                 files_desc.append(" * %s, version %s (%s)" % (desc, version, f))
             elif desc: