[oe-commits] [openembedded-core] 11/11: sstatesig: Improve debug output if getpwuid() fails

git at git.openembedded.org git at git.openembedded.org
Tue Jan 28 11:52:23 UTC 2020


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch zeus
in repository openembedded-core.

commit 2bba0052597020ea887c84419440df11f9859283
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Jan 14 21:05:10 2020 +0000

    sstatesig: Improve debug output if getpwuid() fails
    
    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 at linuxfoundation.org>
    (cherry picked from commit 9d7a5219713af8117eda145052c6d9abdf577d8f)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/lib/oe/sstatesig.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 24a221e..b2316b1 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list