diff options
| -rwxr-xr-x | bin/bitbake | 2 | ||||
| -rw-r--r-- | lib/bb/__init__.py | 2 | ||||
| -rw-r--r-- | lib/bb/cooker.py | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/bin/bitbake b/bin/bitbake index f2d168c52..f494eaa13 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -27,7 +27,7 @@ from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException bb.utils.check_system_locale() -__version__ = "2.7.3" +__version__ = "2.8.0" if __name__ == "__main__": if __version__ != bb.__version__: diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index 768cce84e..eef45fe4e 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -__version__ = "2.7.3" +__version__ = "2.8.0" import sys if sys.version_info < (3, 8, 0): diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index c5bfef55d..25b614f1e 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -315,11 +315,10 @@ class BBCooker: dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db" upstream = self.data.getVar("BB_HASHSERVE_UPSTREAM") or None if upstream: - import socket try: - sock = socket.create_connection(upstream.split(":"), 5) - sock.close() - except socket.error as e: + with hashserv.create_client(upstream) as client: + client.ping() + except ConnectionError as e: bb.warn("BB_HASHSERVE_UPSTREAM is not valid, unable to connect hash equivalence server at '%s': %s" % (upstream, repr(e))) |