[oe-commits] [openembedded-core] 13/19: sstate.bbclass: fix issue while handling long sstate filenames

git at git.openembedded.org git at git.openembedded.org
Sat Feb 8 07:49:42 UTC 2020


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

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

commit 6d8fe44e7e89c36c5c8fa99bdb337793433deb03
Author: Jaewon Lee <jaewon.lee at xilinx.com>
AuthorDate: Thu Feb 6 13:45:11 2020 -0800

    sstate.bbclass: fix issue while handling long sstate filenames
    
    When moving to python3, divison using '/' now returns float instead of
    an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1
    sstate filenames longer than the limit are changed to just include
    necessary info + 3 fields just for information. The space left over
    after the necessary info is divided into 3 for each of the fields.
    Using '//' instead to do the division to solve the following error
    message:
    
    avail = (254 - len(hash + "_" + taskname + extension) -
    len(components[0]) - len(components[1]) - len(components[5]) -
    len(components[6]) - 7) / 3
        >        components[2] = components[2][:avail]
                 components[3] = components[3][:avail]
    TypeError: slice indices must be integers or None or have an __index__
    method
    
    Signed-off-by: Jaewon Lee <jaewon.lee at xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle at xilinx.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/sstate.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index faa6470..0beeb33 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d):
         components = spec.split(":")
         # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information
         # 7 is for the separators
-        avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3
+        avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) // 3
         components[2] = components[2][:avail]
         components[3] = components[3][:avail]
         components[4] = components[4][:avail]

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


More information about the Openembedded-commits mailing list