[Pkg-xen-changes] r611 - trunk/xen-3/debian/bin

[Bastian Blank]

Author: waldi
Date: Wed Dec 24 12:48:13 2008
New Revision: 611

Log:
debian/bin/gencontrol.py: Fix.


Modified:
   trunk/xen-3/debian/bin/gencontrol.py

Modified: trunk/xen-3/debian/bin/gencontrol.py
==============================================================================
--- trunk/xen-3/debian/bin/gencontrol.py	(original)
+++ trunk/xen-3/debian/bin/gencontrol.py	Wed Dec 24 12:48:13 2008
@@ -24,11 +24,12 @@
         packages.extend(self.process_packages(self.templates["control.main"], vars))
 
     def do_arch_setup(self, vars, makeflags, arch, extra):
+        config_entry = self.config.merge('base', arch)
+
         for i in (
             ('xen-arch', 'XEN_ARCH'),
         ):
-            if vars.has_key(i[0]):
-                makeflags[i[1]] = vars[i[0]]
+            makeflags[i[1]] = config_entry[i[0]]
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
         utils = self.templates["control.utils"]