[firmware-free] 02/19: Add subdirectory to filename before splitting into base name and version

[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 d805904290636bf4320d19eb203c67ff65aa7b54
Author: Ben Hutchings <benh at debian.org>
Date:   Sat Sep 11 18:55:56 2010 +0000

    Add subdirectory to filename before splitting into base name and version
    
    [bwh: Cherry-picked from firmware-nonfree commit
     62b2756ac04eedd24973b1bd55fca3643f0bdb2f]
---
 debian/bin/gencontrol.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 09b8da9..8594f97 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -188,9 +188,9 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
             except ValueError:
                 pass
             for f in files:
-                f1  = f.rsplit('-', 1)
                 if root != package:
                     f = root[len(package) + 1 : ] + '/' + f
+                f1 = f.rsplit('-', 1)
                 if f in files_orig:
                     files_real[f] = f, f, None
                 elif len(f1) > 1:

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