Author: waldi
Date: Mon Jul 30 11:20:32 2007
New Revision: 9227
Log:
debian/lib/python/debian_linux/gencontrol.py
- Use merged config entries where usefull.
- Reorg localversion setup.
Modified:
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
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 Mon Jul
30 11:20:32 2007
@@ -101,14 +101,12 @@
makefile.append(("binary-arch-%s-extra:" % arch, cmds))
def do_arch(self, packages, makefile, arch, vars, makeflags, extra):
- config_entry = self.config['base', arch]
- vars.update(config_entry)
+ config_base = self.config['base', arch]
+ vars.update(config_base)
vars['arch'] = arch
makeflags['ARCH'] = arch
- vars['localversion'] = ''
-
self.do_arch_setup(vars, makeflags, arch, extra)
self.do_arch_makefile(makefile, arch, makeflags, extra)
self.do_arch_packages(packages, makefile, arch, vars, makeflags, extra)
@@ -131,12 +129,14 @@
self.do_featureset(packages, makefile, arch, featureset,
vars.copy(), makeflags.copy(), extra)
def do_featureset(self, packages, makefile, arch, featureset, vars,
makeflags, extra):
- config_entry = self.config['base', arch, featureset]
- vars.update(config_entry)
+ config_base = self.config.merge('base', arch, featureset)
+ vars.update(config_base)
makeflags['FEATURESET'] = featureset
+
+ vars['localversion'] = ''
if featureset != 'none':
- vars['localversion'] += '-' + featureset
+ vars['localversion'] = '-' + featureset
self.do_featureset_setup(vars, makeflags, arch, featureset, extra)
self.do_featureset_makefile(makefile, arch, featureset, makeflags,
extra)
@@ -160,8 +160,8 @@
self.do_flavour(packages, makefile, arch, featureset, flavour,
vars.copy(), makeflags.copy(), extra)
def do_flavour(self, packages, makefile, arch, featureset, flavour, vars,
makeflags, extra):
- config_entry = self.config.merge('base', arch, featureset, flavour)
- vars.update(config_entry)
+ config_base = self.config.merge('base', arch, featureset, flavour)
+ vars.update(config_base)
if not vars.has_key('longclass'):
vars['longclass'] = vars['class']
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
