From patchwork Thu May 17 16:51:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 07/12] archiver.bbclass: Add two default set for avoiding error when missing assignment Date: Thu, 17 May 2012 16:51:09 -0000 From: Saul Wold X-Patchwork-Id: 27911 Message-Id: To: openembedded-core@lists.openembedded.org From: Xiaofeng Yan Add two default set(SOURCE_ARCHIVE_LOG_WITH_SCRIPTS, \ SOURCE_ARCHIVE_PACKAGE_TYPE) to archiver.bbclass for avoiding \ building error when forgetting to assign to them. Signed-off-by: Xiaofeng Yan --- meta/classes/archiver.bbclass | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 59b58f4..ac8aa95 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -6,6 +6,8 @@ ARCHIVE_EXCLUDE_FROM ?= ".pc autom4te.cache" ARCHIVE_TYPE ?= "TAR SRPM" DISTRO ?= "poky" PATCHES_ARCHIVE_WITH_SERIES = 'TRUE' +SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= 'logs_with_scripts' +SOURCE_ARCHIVE_PACKAGE_TYPE ?= 'tar' def get_bb_inc(d): '''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}''' @@ -277,7 +279,7 @@ def get_package(d): try: f = open(tarpackage,'r') line = list(set(f.readline().replace('\n','').split())) - except IOError: + except UnboundLocalError,IOError: pass f.close() return line