From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 11 Feb 2011 16:24:26 +0000 (+0000)
Subject: bitbake/fetch2: Fix patch merge error
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4f6794c5842f15b2d2e43be79c548ed29704b2a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake/fetch2: Fix patch merge error

(From Poky rev: 132ec8d3b7e5916c64de85b248632021f51701d3)

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

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index a30b4e204ba..7f3f6bceec2 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -886,7 +886,7 @@ class Fetch(object):
             lf = bb.utils.lockfile(ud.lockfile)
 
             try:
-                network = bb.data.getVar("BB_NO_NETWORK", self.d, True)
+                bb.data.setVar("BB_NO_NETWORK", network, self.d)
  
                 if not m.need_update(u, ud, self.d):
                     localpath = ud.localpath