From patchwork Sun Apr 1 14:21:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 1/7] Hob: handle exceptions in get_parameters() from the bitbake Date: Sun, 01 Apr 2012 14:21:37 -0000 From: Shane Wang X-Patchwork-Id: 25029 Message-Id: <0c8981e042d26a7b381f85256d918a059c866fed.1333289684.git.shane.wang@intel.com> To: bitbake-devel@lists.openembedded.org Handle exceptions during type conversion into integers. Signed-off-by: Shane Wang --- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 33 +++++++++++++++++++++----- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index a329380..c1afa0b 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -401,15 +401,22 @@ class HobHandler(gobject.GObject): num_threads = 1 max_threads = 65536 else: - num_threads = int(num_threads) - max_threads = 16 * num_threads + try: + num_threads = int(num_threads) + max_threads = 16 * num_threads + except: + num_threads = 1 + max_threads = 65536 params["max_threads"] = max_threads bbthread = self.server.runCommand(["getVariable", "BB_NUMBER_THREADS"]) if not bbthread: bbthread = num_threads else: - bbthread = int(bbthread) + try: + bbthread = int(bbthread) + except: + bbthread = num_threads params["bbthread"] = bbthread pmake = self.server.runCommand(["getVariable", "PARALLEL_MAKE"]) @@ -418,7 +425,10 @@ class HobHandler(gobject.GObject): elif isinstance(pmake, int): pass else: - pmake = int(pmake.lstrip("-j ")) + try: + pmake = int(pmake.lstrip("-j ")) + except: + pmake = num_threads params["pmake"] = pmake params["image_addr"] = self.server.runCommand(["getVariable", "DEPLOY_DIR_IMAGE"]) or "" @@ -427,21 +437,30 @@ class HobHandler(gobject.GObject): if not image_extra_size: image_extra_size = 0 else: - image_extra_size = int(image_extra_size) + try: + image_extra_size = int(image_extra_size) + except: + image_extra_size = 0 params["image_extra_size"] = image_extra_size image_rootfs_size = self.server.runCommand(["getVariable", "IMAGE_ROOTFS_SIZE"]) if not image_rootfs_size: image_rootfs_size = 0 else: - image_rootfs_size = int(image_rootfs_size) + try: + image_rootfs_size = int(image_rootfs_size) + except: + image_rootfs_size = 0 params["image_rootfs_size"] = image_rootfs_size image_overhead_factor = self.server.runCommand(["getVariable", "IMAGE_OVERHEAD_FACTOR"]) if not image_overhead_factor: image_overhead_factor = 1 else: - image_overhead_factor = float(image_overhead_factor) + try: + image_overhead_factor = float(image_overhead_factor) + except: + image_overhead_factor = 1 params['image_overhead_factor'] = image_overhead_factor params["incompat_license"] = self.server.runCommand(["getVariable", "INCOMPATIBLE_LICENSE"]) or ""