summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-03-11 06:26:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-17 16:53:05 +0000
commit12cc4f550a001de18d09d9b2da8a9c90e9bb2f24 (patch)
tree009bdee06e8320813b30cc708955101159f58ac1
parent5c9dc408aaf62fc97b36fd1eb601085870a87699 (diff)
downloadpoky-12cc4f550a001de18d09d9b2da8a9c90e9bb2f24.tar.gz
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>
-rw-r--r--meta/classes/toaster.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index a68557882c..4de380bce2 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -265,8 +265,7 @@ python toaster_buildhistory_dump() {
265 with open("%s/installed-package-sizes.txt" % installed_img_path, "r") as fin: 265 with open("%s/installed-package-sizes.txt" % installed_img_path, "r") as fin:
266 for line in fin: 266 for line in fin:
267 line = line.rstrip(";") 267 line = line.rstrip(";")
268 psize, px = line.split("\t") 268 psize, punit, pname = line.split()
269 punit, pname = px.split(" ")
270 # this size is "installed-size" as it measures how much space it takes on disk 269 # this size is "installed-size" as it measures how much space it takes on disk
271 images[target][pname.strip()] = {'size':int(psize)*1024, 'depends' : []} 270 images[target][pname.strip()] = {'size':int(psize)*1024, 'depends' : []}
272 271