summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-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