summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-11 16:24:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-11 16:24:26 +0000
commit132ec8d3b7e5916c64de85b248632021f51701d3 (patch)
tree5983869dbfd84fcd636a358154f5d90a7026367d /bitbake/lib/bb
parenta72d49478e57b05b99cb1b3beec62a9e79a24e7a (diff)
downloadpoky-132ec8d3b7e5916c64de85b248632021f51701d3.tar.gz
bitbake/fetch2: Fix patch merge error
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index f4e9ea96fa..9356487ea6 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -881,7 +881,7 @@ class Fetch(object):
881 lf = bb.utils.lockfile(ud.lockfile) 881 lf = bb.utils.lockfile(ud.lockfile)
882 882
883 try: 883 try:
884 network = bb.data.getVar("BB_NO_NETWORK", self.d, True) 884 bb.data.setVar("BB_NO_NETWORK", network, self.d)
885 885
886 if not m.need_update(u, ud, self.d): 886 if not m.need_update(u, ud, self.d):
887 localpath = ud.localpath 887 localpath = ud.localpath