diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index f112067df5..5c2a1c76c4 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -524,7 +524,7 @@ def fetcher_parse_save(): | |||
524 | def fetcher_parse_done(): | 524 | def fetcher_parse_done(): |
525 | _checksum_cache.save_merge() | 525 | _checksum_cache.save_merge() |
526 | 526 | ||
527 | def fetcher_compare_revisions(): | 527 | def fetcher_compare_revisions(d): |
528 | """ | 528 | """ |
529 | Compare the revisions in the persistant cache with current values and | 529 | Compare the revisions in the persistant cache with current values and |
530 | return true/false on whether they've changed. | 530 | return true/false on whether they've changed. |
@@ -1403,7 +1403,7 @@ class FetchMethod(object): | |||
1403 | Fetch urls | 1403 | Fetch urls |
1404 | Assumes localpath was called first | 1404 | Assumes localpath was called first |
1405 | """ | 1405 | """ |
1406 | raise NoMethodError(url) | 1406 | raise NoMethodError(urldata.url) |
1407 | 1407 | ||
1408 | def unpack(self, urldata, rootdir, data): | 1408 | def unpack(self, urldata, rootdir, data): |
1409 | iterate = False | 1409 | iterate = False |
@@ -1547,7 +1547,7 @@ class FetchMethod(object): | |||
1547 | Check the status of a URL | 1547 | Check the status of a URL |
1548 | Assumes localpath was called first | 1548 | Assumes localpath was called first |
1549 | """ | 1549 | """ |
1550 | logger.info("URL %s could not be checked for status since no method exists.", url) | 1550 | logger.info("URL %s could not be checked for status since no method exists.", urldata.url) |
1551 | return True | 1551 | return True |
1552 | 1552 | ||
1553 | def latest_revision(self, ud, d, name): | 1553 | def latest_revision(self, ud, d, name): |
@@ -1555,7 +1555,7 @@ class FetchMethod(object): | |||
1555 | Look in the cache for the latest revision, if not present ask the SCM. | 1555 | Look in the cache for the latest revision, if not present ask the SCM. |
1556 | """ | 1556 | """ |
1557 | if not hasattr(self, "_latest_revision"): | 1557 | if not hasattr(self, "_latest_revision"): |
1558 | raise ParameterError("The fetcher for this URL does not support _latest_revision", url) | 1558 | raise ParameterError("The fetcher for this URL does not support _latest_revision", ud.url) |
1559 | 1559 | ||
1560 | revs = bb.persist_data.persist('BB_URI_HEADREVS', d) | 1560 | revs = bb.persist_data.persist('BB_URI_HEADREVS', d) |
1561 | key = self.generate_revision_key(ud, d, name) | 1561 | key = self.generate_revision_key(ud, d, name) |
@@ -1786,7 +1786,7 @@ class Fetch(object): | |||
1786 | 1786 | ||
1787 | for url in urls: | 1787 | for url in urls: |
1788 | if url not in self.ud: | 1788 | if url not in self.ud: |
1789 | self.ud[url] = FetchData(url, d) | 1789 | self.ud[url] = FetchData(url, self.d) |
1790 | ud = self.ud[url] | 1790 | ud = self.ud[url] |
1791 | ud.setup_localpath(self.d) | 1791 | ud.setup_localpath(self.d) |
1792 | 1792 | ||