From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 11 Feb 2011 12:04:59 +0000 (+0000)
Subject: bitbake/fetch2: Pass over malformatted (empty) mirror url lines
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f13c23f200d9261169fc25cde4911d639a7275e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake/fetch2: Pass over malformatted (empty) mirror url lines

(From Poky rev: 20ab1cb0ca10b0c7724f2154fe5b54c939b8a887)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index f4bed031507..b168fdc3c45 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -416,7 +416,11 @@ def try_mirrors(d, origud, mirrors, check = False):
     mirrors is the list of mirrors we're going to try
     """
     ld = d.createCopy()
-    for (find, replace) in mirrors:
+    for line in mirrors:
+        try:
+            (find, replace) = line
+        except ValueError:
+            continue
         newuri = uri_replace(origud, find, replace, ld)
         if newuri == origud.url:
             continue