summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-01-08 07:23:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:21:21 +0000
commitb1408ba706a9b3f597381078aa4d88d879635362 (patch)
treeab9d453a9efaca2e5cf46b93891120c318ceac5c
parentfd2823d13b2d2e6436be895bd6034c185225edb6 (diff)
downloadpoky-b1408ba706a9b3f597381078aa4d88d879635362.tar.gz
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 <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer4
1 files changed, 3 insertions, 1 deletions
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):
109 readsection(self.localparser, section, repo) 109 readsection(self.localparser, section, repo)
110 110
111 def update(self, repo, option, value, initmode=False): 111 def update(self, repo, option, value, initmode=False):
112 if self.localparser: 112 # If the main config has the option already, that is what we
113 # are expected to modify.
114 if self.localparser and not self.parser.has_option(repo, option):
113 parser = self.localparser 115 parser = self.localparser
114 section = "%s|%s" % (repo, self.combobranch) 116 section = "%s|%s" % (repo, self.combobranch)
115 conffile = self.localconffile 117 conffile = self.localconffile