[kernel] r5551 - in people/waldi/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sat Jan 21 19:04:03 2006
New Revision: 5551

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
Revert r5532.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sat Jan 21 19:04:03 2006
@@ -164,12 +164,5 @@
             entry[i] = value
         return entry
 
-    def write_control(self, packages):
-        super(gencontrol, self).write_control(packages)
-        f = file("debian/overrides", 'w')
-        for package in packages.itervalues():
-            if package.has_key('Package'):
-                f.write("%s %s %s\n" % (package['Package'], package['Priority'], package['Section']))
-
 if __name__ == '__main__':
     gencontrol()()

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sat Jan 21 19:04:03 2006
@@ -26,7 +26,7 @@
         self.do_main(packages, makefile)
         self.do_extra(packages, makefile)
 
-        self.write_control(packages)
+        self.write_control(packages.itervalues())
         self.write_makefile(makefile)
 
     def do_source(self, packages):
@@ -259,8 +259,8 @@
             return vars[match.group(1)]
         return re.sub(r'@([a-z_]+)@', subst, s)
 
-    def write_control(self, packages):
-        self.write_rfc822(file("debian/control", 'w'), packages.itervalues())
+    def write_control(self, list):
+        self.write_rfc822(file("debian/control", 'w'), list)
 
     def write_makefile(self, out_list):
         out = file("debian/rules.gen", 'w')