Author: waldi Date: Wed Aug 16 08:33:35 2006 New Revision: 7169 Modified: dists/sid/linux-2.6.16/debian/bin/gencontrol.py
Log: Merge r2329 and r2427 from /dists/sid/linux-2.6. debian/bin/gencontrol.py * Only add depends to real image. * Remove empty fields from images. Modified: dists/sid/linux-2.6.16/debian/bin/gencontrol.py ============================================================================== --- dists/sid/linux-2.6.16/debian/bin/gencontrol.py (original) +++ dists/sid/linux-2.6.16/debian/bin/gencontrol.py Wed Aug 16 08:33:35 2006 @@ -130,8 +130,8 @@ else: image = image_type_modulesinline - for i in image: - packages_own.append(self.process_real_image(i, {'depends': image_depends}, config_entry_relations, vars)) + packages_own.append(self.process_real_image(image[0], {'depends': image_depends}, config_entry_relations, vars)) + packages_own.extend(self.process_packages(image[1:], vars)) if image in (image_type_modulesextra, image_type_modulesinline): makeflags['MODULES'] = True @@ -179,7 +179,8 @@ t = relations.get(field.lower(), []) value.extend(t) value.config(config) - entry[field] = value + if value: + entry[field] = value return entry def process_real_tree(self, in_entry, vars): _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes