summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-09-26 12:53:57 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-27 13:02:19 +0100
commit1805574559c3862eaf1fd4ff9a9fc8a05556a8ce (patch)
treef69790f193ce2ba3ed75c93bdb3e9788f92f8dd3
parent6f6b41e64287b21da038b55d4f02b8ef66ddf29f (diff)
downloadpoky-1805574559c3862eaf1fd4ff9a9fc8a05556a8ce.tar.gz
bitbake: siggen: Fix attribute error when hashserver fails
The HashConnectionError class was moved to the client module and needs to be updated. [YOCTO #13537] (Bitbake rev: 9fb862685e5e5a2aa534bc25cab1e4158d708b40) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/siggen.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index e047c217e5..2b51967c02 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -440,7 +440,7 @@ class SignatureGeneratorUniHashMixIn(object):
440 bb.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) 440 bb.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server))
441 else: 441 else:
442 bb.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) 442 bb.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server))
443 except hashserv.HashConnectionError as e: 443 except hashserv.client.HashConnectionError as e:
444 bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) 444 bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))
445 445
446 self.unitaskhashes[key] = unihash 446 self.unitaskhashes[key] = unihash
@@ -504,7 +504,7 @@ class SignatureGeneratorUniHashMixIn(object):
504 bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d) 504 bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d)
505 else: 505 else:
506 bb.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) 506 bb.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server))
507 except hashserv.HashConnectionError as e: 507 except hashserv.client.HashConnectionError as e:
508 bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) 508 bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))
509 finally: 509 finally:
510 if sigfile: 510 if sigfile: