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

[Ben Hutchings]

Author: benh
Date: Sat Sep 11 18:55:56 2010
New Revision: 16264

Log:
Add subdirectory to filename before splitting into base name and version

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	Fri Sep 10 01:24:31 2010	(r16263)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Sat Sep 11 18:55:56 2010	(r16264)
@@ -213,9 +213,9 @@
             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: