aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
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:03:08 +0000
commita3b246ee928d2ec59c8b6a775d9309f5be33ecc7 (patch)
tree16f14b5bc9b3f824da1eb1e6be875c1936225f5c /scripts/combo-layer
parentfdd2e0c1baa80106d26236cb734e0d9a98e3fdac (diff)
downloadopenembedded-core-contrib-a3b246ee928d2ec59c8b6a775d9309f5be33ecc7.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 Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 851003d855a..71fa7b127c0 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