]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstatesig: Improve debug output if getpwuid() fails
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 14 Jan 2020 21:05:10 +0000 (21:05 +0000)
committerArmin Kuster <akuster808@gmail.com>
Sat, 18 Jan 2020 22:04:27 +0000 (14:04 -0800)
If getpwduid fails, we don't see which file it failed on which is key information
to aid debugging. Print this information when exceptions are raised.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9d7a5219713af8117eda145052c6d9abdf577d8f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/lib/oe/sstatesig.py

index 24a221eb1a57ff742414eaef980c5475a5a84a18..b2316b12b8331b520dd2ae8da49d482c4ce47c45 100644 (file)
@@ -521,8 +521,12 @@ def OEOuthashBasic(path, sigfile, task, d):
                     add_perm(stat.S_IXOTH, 'x')
 
                 if include_owners:
-                    update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name)
-                    update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name)
+                    try:
+                        update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name)
+                        update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name)
+                    except KeyError:
+                        bb.warn("KeyError in %s" % path)
+                        raise
 
                 update_hash(" ")
                 if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode):