diff options
-rw-r--r-- | meta/classes/sanity.bbclass | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 8935df8bd8..1fe172f8b2 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -876,18 +876,16 @@ def check_sanity_everybuild(status, d): | |||
876 | 'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \ | 876 | 'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \ |
877 | 'bzr', 'cvs', 'npm', 'sftp', 'ssh'] | 877 | 'bzr', 'cvs', 'npm', 'sftp', 'ssh'] |
878 | for mirror_var in mirror_vars: | 878 | for mirror_var in mirror_vars: |
879 | mirrors = (d.getVar(mirror_var) or '').replace('\\n', '\n').split('\n') | 879 | mirrors = (d.getVar(mirror_var) or '').replace('\\n', ' ').split() |
880 | for mirror_entry in mirrors: | ||
881 | mirror_entry = mirror_entry.strip() | ||
882 | if not mirror_entry: | ||
883 | # ignore blank lines | ||
884 | continue | ||
885 | 880 | ||
886 | try: | 881 | # Split into pairs |
887 | pattern, mirror = mirror_entry.split() | 882 | if len(mirrors) % 2 != 0: |
888 | except ValueError: | 883 | bb.warn('Invalid mirror variable value for %s: %s, should contain paired members.' % (mirror_var, mirrors.strip())) |
889 | bb.warn('Invalid %s: %s, should be 2 members.' % (mirror_var, mirror_entry.strip())) | 884 | continue |
890 | continue | 885 | mirrors = list(zip(*[iter(mirrors)]*2)) |
886 | |||
887 | for mirror_entry in mirrors: | ||
888 | pattern, mirror = mirror_entry | ||
891 | 889 | ||
892 | decoded = bb.fetch2.decodeurl(pattern) | 890 | decoded = bb.fetch2.decodeurl(pattern) |
893 | try: | 891 | try: |