diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-20 12:38:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 13:10:32 +0100 |
| commit | 3c8a561a904b917269e0f8b9113469e43de450e4 (patch) | |
| tree | aaf71e874362e154c2aed592771f857ca5f5d593 /bitbake | |
| parent | 4a0dc38da6805fb22cdc14ecad8bebe7f6a3b5e9 (diff) | |
| download | poky-3c8a561a904b917269e0f8b9113469e43de450e4.tar.gz | |
bitbake: fetch2: Only cache data if fn is set, its pointless caching it against a None value
(From Poky rev: c2df30bf6d1f8c263a38c45866936c1bf496ece5)
(Bitbake rev: f4b59cc6e1c3ddc168a1678ce39ff402ea1ff4cc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 067d60cc9f..2eeec3dd51 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
| @@ -1028,7 +1028,7 @@ class Fetch(object): | |||
| 1028 | self.ud = {} | 1028 | self.ud = {} |
| 1029 | 1029 | ||
| 1030 | fn = d.getVar('FILE', True) | 1030 | fn = d.getVar('FILE', True) |
| 1031 | if cache and fn in urldata_cache: | 1031 | if cache and fn and fn in urldata_cache: |
| 1032 | self.ud = urldata_cache[fn] | 1032 | self.ud = urldata_cache[fn] |
| 1033 | 1033 | ||
| 1034 | for url in urls: | 1034 | for url in urls: |
| @@ -1040,7 +1040,7 @@ class Fetch(object): | |||
| 1040 | self.ud[url] = None | 1040 | self.ud[url] = None |
| 1041 | pass | 1041 | pass |
| 1042 | 1042 | ||
| 1043 | if cache: | 1043 | if fn and cache: |
| 1044 | urldata_cache[fn] = self.ud | 1044 | urldata_cache[fn] = self.ud |
| 1045 | 1045 | ||
| 1046 | def localpath(self, url): | 1046 | def localpath(self, url): |
