[oe-commits] Patrick Ohly : combo-layer: let user choose where properties get updated
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 20 10:59:15 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 5f1cddb9db19156816b492fdea2c960fe9b7e088
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5f1cddb9db19156816b492fdea2c960fe9b7e088
Author: Patrick Ohly <patrick.ohly at intel.com>
Date: Thu Jan 8 07:23:52 2015 -0800
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 at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
scripts/combo-layer | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 851003d..71fa7b1 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
More information about the Openembedded-commits
mailing list