[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4893/8267] bitbake: fetch2: Allow whitespace only mirror entries

[Emmanuele Bassi <ebassi src gnome org>]

commit da6652b526c461c77417385802306e802084d992
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Fri Mar 3 00:13:01 2017 +0000

    bitbake: fetch2: Allow whitespace only mirror entries
    
    Forcing the use of "\n" in mirror variables is pointless, we can just require that
    there are pairs of values.
    
    (Bitbake rev: 044fb04dbe69313ee6908bf4d3cee7f797d0c41c)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/__init__.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 760e24f..672f109 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -538,7 +538,11 @@ def fetcher_compare_revisions():
     return False
 
 def mirror_from_string(data):
-    return [ i.split() for i in (data or "").replace('\\n','\n').split('\n') if i ]
+    mirrors = (data or "").replace('\\n',' ').split()
+    # Split into pairs
+    if len(mirrors) % 2 != 0:
+        bb.warn('Invalid mirror data %s, should have paired members.' % data)
+    return list(zip(*[iter(mirrors)]*2))
 
 def verify_checksum(ud, d, precomputed={}):
     """