summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-04-02 16:29:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-05 18:48:07 +0100
commitb9accbb42a40e1ace0f9790a20712b821bb2b3f6 (patch)
tree587f2c682afba2a5ed2bb15ff9a1b88c93c6b563
parent36164b9a9bcc41094012495e97d4633df60b0f24 (diff)
downloadpoky-b9accbb42a40e1ace0f9790a20712b821bb2b3f6.tar.gz
Hob: handle exceptions when loading templates
Handle exceptions during type conversion to integers. (Bitbake rev: bb3a4e2d40486a347c13563d73e4df6d015a3c6c) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index df9a1558e5..0c1ee07e75 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -106,10 +106,22 @@ class Configuration:
106 self.dldir = template.getVar("DL_DIR") 106 self.dldir = template.getVar("DL_DIR")
107 self.sstatedir = template.getVar("SSTATE_DIR") 107 self.sstatedir = template.getVar("SSTATE_DIR")
108 self.sstatemirror = template.getVar("SSTATE_MIRROR") 108 self.sstatemirror = template.getVar("SSTATE_MIRROR")
109 self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1]) 109 try:
110 self.bbthread = int(template.getVar("BB_NUMBER_THREADS")) 110 self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1])
111 self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE")) 111 except:
112 self.image_extra_size = int(template.getVar("IMAGE_EXTRA_SPACE")) 112 pass
113 try:
114 self.bbthread = int(template.getVar("BB_NUMBER_THREADS"))
115 except:
116 pass
117 try:
118 self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE"))
119 except:
120 pass
121 try:
122 self.image_extra_size = int(template.getVar("IMAGE_EXTRA_SPACE"))
123 except:
124 pass
113 # image_overhead_factor is read-only. 125 # image_overhead_factor is read-only.
114 self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") 126 self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE")
115 self.curr_sdk_machine = template.getVar("SDKMACHINE") 127 self.curr_sdk_machine = template.getVar("SDKMACHINE")