From f310f51a8f26e597b3bdb3bff6e1281bc04c4e25 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 4 Apr 2009 17:32:03 -0500 Subject: [PATCH] Explicitly set target: in per-target spec values --- ChangeLog | 4 ++++ modules/catalyst/config.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b4710863..7140a80c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 04 Apr 2009; Andrew Gaffney + modules/catalyst/config.py: + Explicitly set target: in per-target spec values + 04 Apr 2009; Andrew Gaffney modules/catalyst/arch/arm.py: Apply additional patch from gentoo bug #255793 for arm subarches diff --git a/modules/catalyst/config.py b/modules/catalyst/config.py index ba00de1b..212520a2 100644 --- a/modules/catalyst/config.py +++ b/modules/catalyst/config.py @@ -169,9 +169,10 @@ class Spec: self.target = target def get_values(self, target=None): + tmp = self.values['global'] if target is None: target = self.target - tmp = self.values['global'] + tmp['target'] = target if target in self.values: tmp.update(self.values[target]) return tmp -- 2.26.2