Skip to contentSkip to conversation

archiver.bbclass: Add two default set for avoiding error when missing assignment

PATCH Applied [email protected] 2 participants 3 messages May 16, 2012 – May 18, 2012

lore
Share & tools
lore
#0 lore raw

cover archiver.bbclass: Add two default set for avoiding error when missing assignment

From: Xiaofeng Yan <[email protected]>

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(-)
#1 lore raw

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

From: Xiaofeng Yan <[email protected]>

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.

---
 meta/classes/archiver.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/classes/archiver.bbclass +3 -1
index 59b58f4..ac8aa95 100644
@@ -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
Signature · 1 line
1.7.0.4
Applied
#2 lore raw
In reply to [email protected]
Quoted 20 lines · On 05/16/2012 11:59 AM, [email protected] wrote:

From: Xiaofeng Yan<[email protected]>

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

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

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!