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>
This commit is contained in:
parent
e605ecfd95
commit
e28904e1de
|
@ -310,7 +310,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
|
||||||
|
|
||||||
sub_vbox = gtk.VBox(False)
|
sub_vbox = gtk.VBox(False)
|
||||||
advanced_vbox.pack_start(sub_vbox, gtk.TRUE, gtk.TRUE, 0)
|
advanced_vbox.pack_start(sub_vbox, gtk.TRUE, gtk.TRUE, 0)
|
||||||
searched_string = "file://"
|
|
||||||
|
|
||||||
if self.sstatemirrors_changed == 0:
|
if self.sstatemirrors_changed == 0:
|
||||||
self.sstatemirrors_changed = 1
|
self.sstatemirrors_changed = 1
|
||||||
|
@ -319,16 +318,10 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
|
||||||
sm_list = ["Standard", "", "file://(.*)"]
|
sm_list = ["Standard", "", "file://(.*)"]
|
||||||
self.sstatemirrors_list.append(sm_list)
|
self.sstatemirrors_list.append(sm_list)
|
||||||
else:
|
else:
|
||||||
while sstatemirrors.find(searched_string) != -1:
|
sstatemirrors = [x for x in sstatemirrors.split('\\n')]
|
||||||
if sstatemirrors.find(searched_string,1) != -1:
|
for sstatemirror in sstatemirrors:
|
||||||
sstatemirror = sstatemirrors[:sstatemirrors.find(searched_string,1)]
|
|
||||||
sstatemirrors = sstatemirrors[sstatemirrors.find(searched_string,1):]
|
|
||||||
else:
|
|
||||||
sstatemirror = sstatemirrors
|
|
||||||
sstatemirrors = sstatemirrors[1:]
|
|
||||||
|
|
||||||
sstatemirror_fields = [x for x in sstatemirror.split(' ') if x.strip()]
|
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://(.*)":
|
if sstatemirror_fields[0] == "file://(.*)":
|
||||||
sm_list = ["Standard", sstatemirror_fields[1], "file://(.*)"]
|
sm_list = ["Standard", sstatemirror_fields[1], "file://(.*)"]
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue