diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2013-01-23 14:13:44 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-25 12:42:08 +0000 |
commit | 03fee6c3b1342e6ac03e51a8a3c73b46fb067211 (patch) | |
tree | bb0b7f463ba4e64283cf39f4ace96666f2e5fc0a /bitbake/lib/bb/ui/crumbs/hig | |
parent | 1db3531cd5ecded0ccf6a6fdc03b8ff4755c0c73 (diff) | |
download | poky-03fee6c3b1342e6ac03e51a8a3c73b46fb067211.tar.gz |
bitbake: hob: hob do not use .hob dir for variables from local.conf and bblayers.conf
If .hob exists, hob takes the variable from there. Change to not override anymore
the variables which comes from bblayers.conf and local.conf
[YOCTO #2934]
(Bitbake rev: 00533e83038e3d5e3cd5d1be73c45afece92ec0c)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hig')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py index 3642e9bc5c..50c7510ff3 100644 --- a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py +++ b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py | |||
@@ -323,11 +323,12 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): | |||
323 | sstatemirrors = sstatemirrors[1:] | 323 | sstatemirrors = sstatemirrors[1:] |
324 | 324 | ||
325 | sstatemirror_fields = [x for x in sstatemirror.split(' ') if x.strip()] | 325 | sstatemirror_fields = [x for x in sstatemirror.split(' ') if x.strip()] |
326 | if sstatemirror_fields[0] == "file://(.*)": | 326 | if len(sstatemirror_fields): |
327 | sm_list = [ 0, sstatemirror_fields[1], "file://(.*)"] | 327 | if sstatemirror_fields[0] == "file://(.*)": |
328 | else: | 328 | sm_list = [ 0, sstatemirror_fields[1], "file://(.*)"] |
329 | sm_list = [ 1, sstatemirror_fields[1], sstatemirror_fields[0]] | 329 | else: |
330 | self.sstatemirrors_list.append(sm_list) | 330 | sm_list = [ 1, sstatemirror_fields[1], sstatemirror_fields[0]] |
331 | self.sstatemirrors_list.append(sm_list) | ||
331 | 332 | ||
332 | index = 0 | 333 | index = 0 |
333 | for mirror in self.sstatemirrors_list: | 334 | for mirror in self.sstatemirrors_list: |