[kernel] r4815 - people/waldi/linux-2.6/debian/lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 17:41:55 2005
New Revision: 4815

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/utils.py
Log:
* debian/lib/python/debian_linux/gencontrol.py
  - Use utils.package.
  - Remove debugging code.
* debian/lib/python/debian_linux/utils.py
  - Use utils.package.
  - Remove utils.entry.


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	Sun Nov 13 17:41:55 2005
@@ -206,16 +206,16 @@
         e['Description'] = "%s\n%s" % (self.substitute(desc_short, vars), '\n.\n'.join(desc_pars_wrapped))
 
     def process_package(self, in_entry, vars):
-        e = entry()
-        for i in in_entry.iterkeys():
-            if i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
-                self.process_relation(i, e, in_entry, vars)
-            elif i == 'Description':
+        e = package()
+        for key in in_entry.iterkeys():
+            if key in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
+                self.process_relation(key, e, in_entry, vars)
+            elif key == 'Description':
                 self.process_description(e, in_entry, vars)
-            elif i[:2] == 'X-':
+            elif key[:2] == 'X-':
                 pass
             else:
-                e[i] = self.substitute(in_entry[i], vars)
+                e[key] = self.substitute(in_entry[key], vars)
         return e
 
     def process_packages(self, in_entries, vars):
@@ -252,9 +252,7 @@
     def write_rfc822(self, f, list):
         for entry in list:
             for key, value in entry.iteritems():
-                f.write("%s:" % key)
-                print key, type(value), repr(value)
-                f.write(" %s\n" % value)
+                f.write("%s: %s\n" % (key, value))
             f.write('\n')
 
 

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/utils.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/utils.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/utils.py	Sun Nov 13 17:41:55 2005
@@ -119,8 +119,6 @@
             if self.has_key(i):
                 yield self[i]
 
-entry = package
-
 class templates(dict):
     def __init__(self, dir = None):
         if dir is None:
@@ -145,7 +143,7 @@
         f = file("%s/%s.in" % (self.dir, filename))
 
         while True:
-            e = entry()
+            e = package()
             while True:
                 line = f.readline()
                 if not line: