aboutsummaryrefslogtreecommitdiff
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 15:37:05 +0000
commit7b3692f57628b33840f6dbcddbe05ae56c24b98e (patch)
tree015a7c063209e177332a1e7a0d61933bb3fc6b88
parent4bf84edeb6cf4ba82a21bc7ceb1da4f59d839064 (diff)
downloadopenembedded-core-contrib-7b3692f57628b33840f6dbcddbe05ae56c24b98e.zip
openembedded-core-contrib-7b3692f57628b33840f6dbcddbe05ae56c24b98e.tar.gz
openembedded-core-contrib-7b3692f57628b33840f6dbcddbe05ae56c24b98e.tar.bz2
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. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 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' : []}