[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5169/8267] toaster.bbclass: Correct parsing of installed-package-sizes.txt



commit 12cc4f550a001de18d09d9b2da8a9c90e9bb2f24
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Sat Mar 11 06:26:54 2017 +0100

    toaster.bbclass: Correct parsing of installed-package-sizes.txt
    
    The recent change in buildhistory.bbclass to use a tab in
    installed-package-sizes.txt between "KiB" and the package name caused
    toaster_buildhistory_dump() to fail since it parses the file and
    expected a space there.
    
    (From OE-Core rev: 7b3692f57628b33840f6dbcddbe05ae56c24b98e)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/toaster.bbclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index a685578..4de380b 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -265,8 +265,7 @@ python toaster_buildhistory_dump() {
             with open("%s/installed-package-sizes.txt" % installed_img_path, "r") as fin:
                 for line in fin:
                     line = line.rstrip(";")
-                    psize, px = line.split("\t")
-                    punit, pname = px.split(" ")
+                    psize, punit, pname = line.split()
                     # this size is "installed-size" as it measures how much space it takes on disk
                     images[target][pname.strip()] = {'size':int(psize)*1024, 'depends' : []}
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]