[PATCH 0/1] archiver.bbclass: Add two default set for avoiding error when missing assignment

[PATCH 0/1] archiver.bbclass: Add two default set for avoiding error when missing assignment

[xiaofeng.yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/archiver
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/archiver

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  archiver.bbclass: Add default set

 meta/classes/archiver.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

[PATCH 0/1] archiver.bbclass: Add two default set for avoiding error when missing assignment

[xiaofeng.yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

This is V2.

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.
Make some modification according to clarson's suggestion. Thank him correct my fault.

The following changes since commit d4e265661517f8dd4e1648fdc56bac5973f986f6:
  Saul Wold (1):
        poky.conf: Change WARNS -> ERRORS

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib xiaofeng/archiver
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/archiver

Xiaofeng Yan (1):
  archiver.bbclass: Add two default set for avoiding error when missing
    assignment

 meta/classes/archiver.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

[PATCH 1/1] archiver.bbclass: Add two default set for avoiding error when missing assignment

[xiaofeng.yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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 <xiaofeng.yan@windriver.com>
---
 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
-- 
1.7.0.4

Re: [PATCH 0/1] archiver.bbclass: Add two default set for avoiding error when missing assignment

[Saul Wold]

On 05/16/2012 11:59 AM, xiaofeng.yan@windriver.com wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> This is V2.
>
> 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.
> Make some modification according to clarson's suggestion. Thank him correct my fault.
>
> The following changes since commit d4e265661517f8dd4e1648fdc56bac5973f986f6:
>    Saul Wold (1):
>          poky.conf: Change WARNS ->  ERRORS
>
> are available in the git repository at:
>
>    git://git.pokylinux.org/poky-contrib xiaofeng/archiver
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/archiver
>
> Xiaofeng Yan (1):
>    archiver.bbclass: Add two default set for avoiding error when missing
>      assignment
>
>   meta/classes/archiver.bbclass |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
Merged into OE-Core

Thanks
	Sau!