diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/__init__.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 6ef0c6fe7a..600e2161fe 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -586,12 +586,12 @@ def verify_checksum(ud, d, precomputed={}): | |||
586 | raise NoChecksumError('Missing SRC_URI checksum', ud.url) | 586 | raise NoChecksumError('Missing SRC_URI checksum', ud.url) |
587 | 587 | ||
588 | # Log missing sums so user can more easily add them | 588 | # Log missing sums so user can more easily add them |
589 | logger.warn('Missing md5 SRC_URI checksum for %s, consider adding to the recipe:\n' | 589 | logger.warning('Missing md5 SRC_URI checksum for %s, consider adding to the recipe:\n' |
590 | 'SRC_URI[%s] = "%s"', | 590 | 'SRC_URI[%s] = "%s"', |
591 | ud.localpath, ud.md5_name, md5data) | 591 | ud.localpath, ud.md5_name, md5data) |
592 | logger.warn('Missing sha256 SRC_URI checksum for %s, consider adding to the recipe:\n' | 592 | logger.warning('Missing sha256 SRC_URI checksum for %s, consider adding to the recipe:\n' |
593 | 'SRC_URI[%s] = "%s"', | 593 | 'SRC_URI[%s] = "%s"', |
594 | ud.localpath, ud.sha256_name, sha256data) | 594 | ud.localpath, ud.sha256_name, sha256data) |
595 | 595 | ||
596 | # We want to alert the user if a checksum is defined in the recipe but | 596 | # We want to alert the user if a checksum is defined in the recipe but |
597 | # it does not match. | 597 | # it does not match. |
@@ -659,9 +659,9 @@ def verify_donestamp(ud, d, origud=None): | |||
659 | # files to those containing the checksums. | 659 | # files to those containing the checksums. |
660 | if not isinstance(e, EOFError): | 660 | if not isinstance(e, EOFError): |
661 | # Ignore errors, they aren't fatal | 661 | # Ignore errors, they aren't fatal |
662 | logger.warn("Couldn't load checksums from donestamp %s: %s " | 662 | logger.warning("Couldn't load checksums from donestamp %s: %s " |
663 | "(msg: %s)" % (ud.donestamp, type(e).__name__, | 663 | "(msg: %s)" % (ud.donestamp, type(e).__name__, |
664 | str(e))) | 664 | str(e))) |
665 | 665 | ||
666 | try: | 666 | try: |
667 | checksums = verify_checksum(ud, d, precomputed_checksums) | 667 | checksums = verify_checksum(ud, d, precomputed_checksums) |
@@ -675,8 +675,8 @@ def verify_donestamp(ud, d, origud=None): | |||
675 | except ChecksumError as e: | 675 | except ChecksumError as e: |
676 | # Checksums failed to verify, trigger re-download and remove the | 676 | # Checksums failed to verify, trigger re-download and remove the |
677 | # incorrect stamp file. | 677 | # incorrect stamp file. |
678 | logger.warn("Checksum mismatch for local file %s\n" | 678 | logger.warning("Checksum mismatch for local file %s\n" |
679 | "Cleaning and trying again." % ud.localpath) | 679 | "Cleaning and trying again." % ud.localpath) |
680 | if os.path.exists(ud.localpath): | 680 | if os.path.exists(ud.localpath): |
681 | rename_bad_checksum(ud, e.checksum) | 681 | rename_bad_checksum(ud, e.checksum) |
682 | bb.utils.remove(ud.donestamp) | 682 | bb.utils.remove(ud.donestamp) |
@@ -708,8 +708,8 @@ def update_stamp(ud, d): | |||
708 | except ChecksumError as e: | 708 | except ChecksumError as e: |
709 | # Checksums failed to verify, trigger re-download and remove the | 709 | # Checksums failed to verify, trigger re-download and remove the |
710 | # incorrect stamp file. | 710 | # incorrect stamp file. |
711 | logger.warn("Checksum mismatch for local file %s\n" | 711 | logger.warning("Checksum mismatch for local file %s\n" |
712 | "Cleaning and trying again." % ud.localpath) | 712 | "Cleaning and trying again." % ud.localpath) |
713 | if os.path.exists(ud.localpath): | 713 | if os.path.exists(ud.localpath): |
714 | rename_bad_checksum(ud, e.checksum) | 714 | rename_bad_checksum(ud, e.checksum) |
715 | bb.utils.remove(ud.donestamp) | 715 | bb.utils.remove(ud.donestamp) |
@@ -984,8 +984,8 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): | |||
984 | 984 | ||
985 | except bb.fetch2.BBFetchException as e: | 985 | except bb.fetch2.BBFetchException as e: |
986 | if isinstance(e, ChecksumError): | 986 | if isinstance(e, ChecksumError): |
987 | logger.warn("Mirror checksum failure for url %s (original url: %s)\nCleaning and trying again." % (ud.url, origud.url)) | 987 | logger.warning("Mirror checksum failure for url %s (original url: %s)\nCleaning and trying again." % (ud.url, origud.url)) |
988 | logger.warn(str(e)) | 988 | logger.warning(str(e)) |
989 | if os.path.exists(ud.localpath): | 989 | if os.path.exists(ud.localpath): |
990 | rename_bad_checksum(ud, e.checksum) | 990 | rename_bad_checksum(ud, e.checksum) |
991 | elif isinstance(e, NoChecksumError): | 991 | elif isinstance(e, NoChecksumError): |
@@ -1200,7 +1200,7 @@ class FetchData(object): | |||
1200 | raise NonLocalMethod() | 1200 | raise NonLocalMethod() |
1201 | 1201 | ||
1202 | if self.parm.get("proto", None) and "protocol" not in self.parm: | 1202 | if self.parm.get("proto", None) and "protocol" not in self.parm: |
1203 | logger.warn('Consider updating %s recipe to use "protocol" not "proto" in SRC_URI.', d.getVar('PN', True)) | 1203 | logger.warning('Consider updating %s recipe to use "protocol" not "proto" in SRC_URI.', d.getVar('PN', True)) |
1204 | self.parm["protocol"] = self.parm.get("proto", None) | 1204 | self.parm["protocol"] = self.parm.get("proto", None) |
1205 | 1205 | ||
1206 | if hasattr(self.method, "urldata_init"): | 1206 | if hasattr(self.method, "urldata_init"): |
@@ -1596,14 +1596,14 @@ class Fetch(object): | |||
1596 | 1596 | ||
1597 | except BBFetchException as e: | 1597 | except BBFetchException as e: |
1598 | if isinstance(e, ChecksumError): | 1598 | if isinstance(e, ChecksumError): |
1599 | logger.warn("Checksum failure encountered with download of %s - will attempt other sources if available" % u) | 1599 | logger.warning("Checksum failure encountered with download of %s - will attempt other sources if available" % u) |
1600 | logger.debug(1, str(e)) | 1600 | logger.debug(1, str(e)) |
1601 | if os.path.exists(ud.localpath): | 1601 | if os.path.exists(ud.localpath): |
1602 | rename_bad_checksum(ud, e.checksum) | 1602 | rename_bad_checksum(ud, e.checksum) |
1603 | elif isinstance(e, NoChecksumError): | 1603 | elif isinstance(e, NoChecksumError): |
1604 | raise | 1604 | raise |
1605 | else: | 1605 | else: |
1606 | logger.warn('Failed to fetch URL %s, attempting MIRRORS if available' % u) | 1606 | logger.warning('Failed to fetch URL %s, attempting MIRRORS if available' % u) |
1607 | logger.debug(1, str(e)) | 1607 | logger.debug(1, str(e)) |
1608 | firsterr = e | 1608 | firsterr = e |
1609 | # Remove any incomplete fetch | 1609 | # Remove any incomplete fetch |