diff options
| author | Cristiana Voicu <cristiana.voicu@intel.com> | 2013-07-22 10:54:10 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 15:25:08 +0100 |
| commit | e28904e1de029a1ba3a19df766d698a31d067161 (patch) | |
| tree | 06f6dbe583dc4e832bbafb0976bfce17076bb99d /bitbake/lib | |
| parent | e605ecfd95d2b1573cb51de01c2e0c72e10b8ae0 (diff) | |
| download | ast2050-yocto-poky-e28904e1de029a1ba3a19df766d698a31d067161.zip ast2050-yocto-poky-e28904e1de029a1ba3a19df766d698a31d067161.tar.gz | |
bitbake: hob: changed the split of SSTATE_MIRRORS variable
Until now the split made searching the string "file://", but
this is not ok when SSTATE_VARIABLE has the following form:
SSTATE_MIRRORS ?= "\
file://.* http://someserver.tld/share/sstate/PATH \n \
file://.* file:///some/local/dir/sstate/PATH"
In the documentation I've found that \n is the list separator.
[YOCTO #4857]
(Bitbake rev: 73bcd96928cb2df390e1fc6d3a8b7ce3e9d546a4)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py index c1bd45f..e43080a 100644 --- a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py +++ b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py @@ -310,7 +310,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): sub_vbox = gtk.VBox(False) advanced_vbox.pack_start(sub_vbox, gtk.TRUE, gtk.TRUE, 0) - searched_string = "file://" if self.sstatemirrors_changed == 0: self.sstatemirrors_changed = 1 @@ -319,16 +318,10 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): sm_list = ["Standard", "", "file://(.*)"] self.sstatemirrors_list.append(sm_list) else: - while sstatemirrors.find(searched_string) != -1: - if sstatemirrors.find(searched_string,1) != -1: - sstatemirror = sstatemirrors[:sstatemirrors.find(searched_string,1)] - sstatemirrors = sstatemirrors[sstatemirrors.find(searched_string,1):] - else: - sstatemirror = sstatemirrors - sstatemirrors = sstatemirrors[1:] - + sstatemirrors = [x for x in sstatemirrors.split('\\n')] + for sstatemirror in sstatemirrors: sstatemirror_fields = [x for x in sstatemirror.split(' ') if x.strip()] - if len(sstatemirror_fields): + if len(sstatemirror_fields) == 2: if sstatemirror_fields[0] == "file://(.*)": sm_list = ["Standard", sstatemirror_fields[1], "file://(.*)"] else: |
