diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-16 12:35:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-16 12:35:35 +0000 |
| commit | 3ef2d39dbf8a573acfbf633c1d5d7cb3cee18788 (patch) | |
| tree | 26b3362c7adbb3bfa6f93fd7936637be0c36b46a | |
| parent | 7e4c694c9f53ce9458e052adb918c45db88254dd (diff) | |
| download | poky-3ef2d39dbf8a573acfbf633c1d5d7cb3cee18788.tar.gz | |
bitbake/fecth2: Ensure BB_FETCH_PREMIRRORONLY being set as false is handled correctly
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index a5ba166a89..fb8e9e4d0c 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
| @@ -903,6 +903,7 @@ class Fetch(object): | |||
| 903 | urls = self.urls | 903 | urls = self.urls |
| 904 | 904 | ||
| 905 | network = bb.data.getVar("BB_NO_NETWORK", self.d, True) | 905 | network = bb.data.getVar("BB_NO_NETWORK", self.d, True) |
| 906 | premirroronly = (bb.data.getVar("BB_FETCH_PREMIRRORONLY", self.d, True) == "1") | ||
| 906 | 907 | ||
| 907 | for u in urls: | 908 | for u in urls: |
| 908 | ud = self.ud[u] | 909 | ud = self.ud[u] |
| @@ -925,7 +926,7 @@ class Fetch(object): | |||
| 925 | mirrors = mirror_from_string(bb.data.getVar('PREMIRRORS', self.d, True)) | 926 | mirrors = mirror_from_string(bb.data.getVar('PREMIRRORS', self.d, True)) |
| 926 | localpath = try_mirrors(self.d, ud, mirrors, False) | 927 | localpath = try_mirrors(self.d, ud, mirrors, False) |
| 927 | 928 | ||
| 928 | if bb.data.getVar("BB_FETCH_PREMIRRORONLY", self.d, True) is not None: | 929 | if premirroronly: |
| 929 | bb.data.setVar("BB_NO_NETWORK", "1", self.d) | 930 | bb.data.setVar("BB_NO_NETWORK", "1", self.d) |
| 930 | 931 | ||
| 931 | if not localpath and m.need_update(u, ud, self.d): | 932 | if not localpath and m.need_update(u, ud, self.d): |
