diff options
| author | Bastian Blank <waldi@debian.org> | 2006-08-20 11:07:00 +0000 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2006-08-20 11:07:00 +0000 |
| commit | 891bdb9a1e94eaf1af6284d82a128dbe308a8c37 (patch) | |
| tree | 760a44c1c1e0b710e4d4492d674eb1c8bf276ea9 /debian | |
| parent | e3caa1fe8dfe3f00a2b689a5c70bd45f4a9ede0b (diff) | |
| download | kernel_replicant_linux-891bdb9a1e94eaf1af6284d82a128dbe308a8c37.tar.gz kernel_replicant_linux-891bdb9a1e94eaf1af6284d82a128dbe308a8c37.tar.bz2 kernel_replicant_linux-891bdb9a1e94eaf1af6284d82a128dbe308a8c37.zip | |
debian/lib/python/debian_linux/config.py: Fix merge order.
svn path=/dists/sid/linux-2.6/; revision=7199
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/lib/python/debian_linux/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/lib/python/debian_linux/config.py b/debian/lib/python/debian_linux/config.py index 2b00f859f59a..54c009d239f2 100644 --- a/debian/lib/python/debian_linux/config.py +++ b/debian/lib/python/debian_linux/config.py @@ -173,11 +173,11 @@ class config_reader_arch(config_reader): ret.update(self.get((section,), {})) if arch: ret.update(self.get((section, arch), {})) + if flavour and subarch and subarch != 'none': + ret.update(self.get((section, arch, 'none', flavour), {})) if subarch: ret.update(self.get((section, arch, subarch), {})) if flavour: - if subarch != 'none': - ret.update(self.get((section, arch, 'none', flavour), {})) ret.update(self.get((section, arch, subarch, flavour), {})) return ret |