[kernel] r9960 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sat Dec 15 23:31:06 2007
New Revision: 9960

Log:
* debian/bin/gencontrol.py: Generate list of versions from changelog.
* debian/lib/python/debian_linux/gencontrol.py: Read changelog.


Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Sat Dec 15 23:31:06 2007
@@ -10,7 +10,7 @@
 
 class Gencontrol(Base):
     def __init__(self, config_dirs = ["debian/config"], template_dirs = ["debian/templates"]):
-        super(Gencontrol, self).__init__(ConfigCoreHierarchy(config_dirs), Templates(template_dirs))
+        super(Gencontrol, self).__init__(ConfigCoreHierarchy(config_dirs), Templates(template_dirs), VersionLinux)
         self.process_changelog()
         self.config_dirs = config_dirs
 
@@ -243,7 +243,7 @@
 
         vars = {
             'home': '/usr/src/kernel-patches/all/%s/debian' % self.version.linux_upstream,
-            'revisions': ' '.join([i.version.debian for i in self.changelog[::-1]]),
+            'revisions': ' '.join([i.debian for i in self.versions[::-1]]),
             'source': "%(linux_upstream)s-%(debian)s" % self.version.__dict__,
             'upstream': self.version.linux_upstream,
         }
@@ -255,14 +255,13 @@
         file('debian/bin/patch.unpatch', 'w').write(unpatch)
 
     def process_changelog(self):
-        in_changelog = Changelog(version = VersionLinux)
-        act_upstream = in_changelog[0].version.linux_upstream
-        changelog = []
-        for i in in_changelog:
+        act_upstream = self.changelog[0].version.linux_upstream
+        versions = []
+        for i in self.changelog:
             if i.version.linux_upstream != act_upstream:
                 break
-            changelog.append(i)
-        self.changelog = changelog
+            versions.append(i.version)
+        self.versions = versions
         self.version = self.changelog[0].version
         if self.version.linux_modifier is not None:
             self.abiname = ''
@@ -285,16 +284,15 @@
 
     def process_real_tree(self, in_entry, vars):
         entry = self.process_package(in_entry, vars)
-        versions = [i.version for i in self.changelog[::-1]]
         for i in (('Depends', 'Provides')):
             value = PackageRelation()
             value.extend(entry.get(i, []))
             if i == 'Depends':
                 v = self.changelog[0].version
                 value.append("linux-patch-debian-%s (= %s)" % (v.linux_version, v.complete))
-                value.append(' | '.join(["linux-source-%s (= %s)" % (v.linux_version, v.complete) for v in versions]))
+                value.append(' | '.join(["linux-source-%s (= %s)" % (v.linux_version, v.complete) for v in self.versions]))
             elif i == 'Provides':
-                value.extend(["linux-tree-%s" % v.complete.replace('~', '-') for v in versions])
+                value.extend(["linux-tree-%s" % v.complete.replace('~', '-') for v in self.versions])
             entry[i] = value
         return entry
 

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sat Dec 15 23:31:06 2007
@@ -69,8 +69,9 @@
 class Gencontrol(object):
     makefile_targets = ('binary-arch', 'build', 'setup', 'source')
 
-    def __init__(self, config, templates):
+    def __init__(self, config, templates, version = Version):
         self.config, self.templates = config, templates
+        self.changelog = Changelog(version = version)
 
     def __call__(self):
         packages = PackagesList()