[Pkg-xen-changes] r954 - in trunk/xen/debian: . bin lib/python/debian_xen

[Bastian Blank]

Author: waldi
Date: Tue Jan 31 13:06:27 2012
New Revision: 954

Log:
* debian/bin, debian/lib: Update.
* debian/rules.defs: Use 3.2.0-1.

Modified:
   trunk/xen/debian/bin/gencontrol.py
   trunk/xen/debian/lib/python/debian_xen/debian.py
   trunk/xen/debian/rules.defs

Modified: trunk/xen/debian/bin/gencontrol.py
==============================================================================
--- trunk/xen/debian/bin/gencontrol.py	Sun Dec 11 17:48:04 2011	(r953)
+++ trunk/xen/debian/bin/gencontrol.py	Tue Jan 31 13:06:27 2012	(r954)
@@ -3,15 +3,20 @@
 import os, sys
 sys.path.append(os.path.join(sys.path[0], "../lib/python"))
 
-from debian_xen.debian import VersionXen, PackageFieldList
+from debian_xen.debian import VersionXen
 from debian_linux.config import ConfigCoreHierarchy
-from debian_linux.debian import Changelog
+from debian_linux.debian import Changelog, PackageArchitecture
 from debian_linux.gencontrol import Gencontrol as Base
 from debian_linux.utils import Templates
 
 class Gencontrol(Base):
+    config_schema = {
+        'description': {
+        }
+    }
+
     def __init__(self):
-        super(Gencontrol, self).__init__(ConfigCoreHierarchy(["debian/arch"]), Templates(["debian/templates"]))
+        super(Gencontrol, self).__init__(ConfigCoreHierarchy(self.config_schema, ["debian/arch"]), Templates(["debian/templates"]))
         self.process_changelog()
 
     def do_main_setup(self, vars, makeflags, extra):
@@ -39,9 +44,9 @@
             else:
                 packages.append(package)
 
-            arches = package.setdefault('Architecture', PackageFieldList())
+            arches = package.setdefault('Architecture', PackageArchitecture())
             if 'all' not in arches:
-                arches.append(arch)
+                arches.add(arch)
 
         package_utils_name = packages_utils[0]['Package']
 
@@ -80,11 +85,10 @@
 
         for package in packages_own:
             name = package['Package']
-            if packages.has_key(name):
+            package.setdefault('Architecture', PackageArchitecture()).add(arch)
+            if name in packages:
                 package = packages.get(name)
-                package['Architecture'].append(arch)
             else:
-                package['Architecture'] = [arch]
                 packages.append(package)
 
         package_name = packages_own[0]['Package']

Modified: trunk/xen/debian/lib/python/debian_xen/debian.py
==============================================================================
--- trunk/xen/debian/lib/python/debian_xen/debian.py	Sun Dec 11 17:48:04 2011	(r953)
+++ trunk/xen/debian/lib/python/debian_xen/debian.py	Tue Jan 31 13:06:27 2012	(r954)
@@ -1,6 +1,5 @@
 import re
-from debian_linux.debian import Version, PackageFieldList
-from debian_linux.debian import PackageFieldList as _PackageFieldList
+from debian_linux.debian import Version
 
 
 class VersionXen(Version):
@@ -29,8 +28,3 @@
         d = match.groupdict()
         self.xen_version = d['version']
 
-
-class PackageFieldList(_PackageFieldList):
-    def __init__(self, value=None):
-        if value:
-            super(self, PackageFieldList).__init__(value)

Modified: trunk/xen/debian/rules.defs
==============================================================================
--- trunk/xen/debian/rules.defs	Sun Dec 11 17:48:04 2011	(r953)
+++ trunk/xen/debian/rules.defs	Tue Jan 31 13:06:27 2012	(r954)
@@ -1,4 +1,4 @@
-KERNELVERSION := 3.1.0-1
+KERNELVERSION := 3.2.0-1
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates