[firmware-free] 07/19: Add symlink names after regular file names in package descriptions

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-free.

commit cc702fc7158d9cc3c7292e1ff5051b07cc837970
Author: Ben Hutchings <benh at debian.org>
Date:   Wed May 18 04:14:40 2011 +0000

    Add symlink names after regular file names in package descriptions
    
    [bwh: Cherry-picked from firmware-nonfree commit
     856b6755beba34cda518ef1efb62ad8a142f52a2]
---
 debian/bin/gencontrol.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index d48f06d..2c20bf0 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -188,6 +188,7 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
         files_orig = config_entry['files']
         files_real = {}
         links = {}
+        links_rev = {}
 
         for root, dirs, files in os.walk(package):
             try:
@@ -201,6 +202,7 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
                 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:
@@ -231,6 +233,10 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
             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:
                 desc = "%s, version %s (%s)" % (desc, version, f)
             elif desc:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-free.git