summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/sstatesig.py
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2023-10-09 08:40:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-19 13:38:56 +0100
commitf784681413981cc1afd1e12e27438e0db6eef192 (patch)
treeb239813bb9b8b011d19b35179da64ad153de3ea7 /meta/lib/oe/sstatesig.py
parent70eddc70f835eb25396dee11698ae49b22c25345 (diff)
downloadpoky-f784681413981cc1afd1e12e27438e0db6eef192.tar.gz
sstatesig: be more precise and show the full path in exceptions
Also remove the warning than doesn't make sense as the code will generate an exception and bitbake will abort. Before: | WARNING: core-image-minimal-initramfs-1.0-r0 do_image_complete: KeyError in . | Exception: Exception: KeyError: 'getpwuid(): uid not found: xxxxx' | Path . is owned by uid xxxxx, gid yyy, which doesn't match any user/group on target. This may be due to host contamination. After: | Exception: Exception: KeyError: 'getpwuid(): uid not found: xxxxx' | Path /build/tmp/work/intel_corei7_64-lmp-linux/core-image-minimal-initramfs/1.0-r0/sstate-build-image_complete is owned by uid xxxxx, gid yyy, which doesn't match any user/group on target. This may be due to host contamination. (From OE-Core rev: 90f84e345950a02bf91f823cc9c6d893e7cd1100) Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/sstatesig.py')
-rw-r--r--meta/lib/oe/sstatesig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 5bf1697e72..42e13a8c80 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -598,9 +598,9 @@ def OEOuthashBasic(path, sigfile, task, d):
598 update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name) 598 update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name)
599 update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name) 599 update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name)
600 except KeyError as e: 600 except KeyError as e:
601 bb.warn("KeyError in %s" % path)
602 msg = ("KeyError: %s\nPath %s is owned by uid %d, gid %d, which doesn't match " 601 msg = ("KeyError: %s\nPath %s is owned by uid %d, gid %d, which doesn't match "
603 "any user/group on target. This may be due to host contamination." % (e, path, s.st_uid, s.st_gid)) 602 "any user/group on target. This may be due to host contamination." %
603 (e, os.path.abspath(path), s.st_uid, s.st_gid))
604 raise Exception(msg).with_traceback(e.__traceback__) 604 raise Exception(msg).with_traceback(e.__traceback__)
605 605
606 if include_timestamps: 606 if include_timestamps: