From b1408ba706a9b3f597381078aa4d88d879635362 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 8 Jan 2015 07:23:52 -0800 Subject: combo-layer: let user choose where properties get updated When updating a property (at the moment, only 'last_revision'), first check whether the user already added it to the main config. If so, update there even if there is a local config. This way, 'last_revision' can be shared between developers as part of the repository while still configuring per-developer repo paths outside of the git repository in a local config. An example of a repository which is set up like that is tizen-distro, with instructions for such a collaborative maintenance found here: https://review.tizen.org/git/?p=scm/bb/tizen-distro.git;a=blob;f=README;hb=refs/heads/tizen-ivi (From OE-Core rev: a3b246ee928d2ec59c8b6a775d9309f5be33ecc7) Signed-off-by: Patrick Ohly Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/combo-layer | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/combo-layer') diff --git a/scripts/combo-layer b/scripts/combo-layer index 851003d855..71fa7b127c 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -109,7 +109,9 @@ class Configuration(object): readsection(self.localparser, section, repo) def update(self, repo, option, value, initmode=False): - if self.localparser: + # If the main config has the option already, that is what we + # are expected to modify. + if self.localparser and not self.parser.has_option(repo, option): parser = self.localparser section = "%s|%s" % (repo, self.combobranch) conffile = self.localconffile -- cgit v1.2.3-54-g00ecf