From: Jose Quaresma <quaresma.jose@gmail.com>
Date: Thu, 4 Apr 2024 09:45:57 +0000 (+0100)
Subject: sstatesig: fix netrc.NetrcParseError exception
X-Git-Tag: yocto-5.2~3249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=486ed69939f1b7572f121960c2dde246032686e7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

sstatesig: fix netrc.NetrcParseError exception

Looks like sometimes the e.filename and the e.lineno is not properly set by the netrc
and this can cause TypeError.

| File "/poky/meta/lib/oe/sstatesig.py", line 342, in init_rundepcheck
|     bb.warn("Error parsing %s:%d: %s" % (e.filename, e.lineno, e.msg))
|             ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| TypeError: %d format: a real number is required, not NoneType

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index b9aa39cdccf..a46e5502ab3 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -339,7 +339,7 @@ class SignatureGeneratorOEEquivHash(SignatureGeneratorOEBasicHashMixIn, bb.sigge
             except FileNotFoundError:
                 pass
             except netrc.NetrcParseError as e:
-                bb.warn("Error parsing %s:%d: %s" % (e.filename, e.lineno, e.msg))
+                bb.warn("Error parsing %s:%s: %s" % (e.filename, str(e.lineno), e.msg))
 
 # Insert these classes into siggen's namespace so it can see and select them
 bb.siggen.SignatureGeneratorOEBasicHash = SignatureGeneratorOEBasicHash