Skip to contentSkip to conversation

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

PATCH In review [email protected] 2 participants 4 messages May 11, 2012 – May 14, 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]>

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 <[email protected]>
---

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

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

PATCH 1/1 archiver.bbclass: Add default set

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 |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta/classes/archiver.bbclass +5 -1
index 59b58f4..a720db2 100644
@@ -6,6 +6,10 @@ 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'
+export SOURCE_ARCHIVE_LOG_WITH_SCRIPTS
+export SOURCE_ARCHIVE_PACKAGE_TYPE
 
 def get_bb_inc(d):
 	'''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}'''
@@ -277,7 +281,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
#2 lore raw

Re: [PATCH 1/1] archiver.bbclass: Add default set

meta/classes/archiver.bbclass ARCHIVE_EXCLUDE_FROM ?= ".pc autom4te.cache" · line 12

Quoted 12 lines · On Fri, May 11, 2012 at 3:13 AM, <[email protected]> wrote:
meta/classes/archiver.bbclass +0 -0
index 59b58f4..a720db2 100644
@@ -6,6 +6,10 @@ ARCHIVE_EXCLUDE_FROM ?= ".pc autom4te.cache"

 ARCHIVE_TYPE ?= "TAR SRPM"
 DISTRO ?= "poky"
 PATCHES_ARCHIVE_WITH_SERIES = 'TRUE'

meta/classes/archiver.bbclass +4 -0
+SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= 'logs_with_scripts'
+SOURCE_ARCHIVE_PACKAGE_TYPE ?= 'tar'
+export SOURCE_ARCHIVE_LOG_WITH_SCRIPTS
+export SOURCE_ARCHIVE_PACKAGE_TYPE

I don't think you understand what 'export' does or why it exists. Please fix that, and remove these lines. Thanks.

Signature · 1 line
Christopher Larson
#3 lore raw

Re: [PATCH 1/1] archiver.bbclass: Add default set

Quoted 15 lines · Chris Larson

meta/classes/archiver.bbclass ARCHIVE_EXCLUDE_FROM ?= ".pc autom4te.cache" · line 12

Quoted 12 lines · On Fri, May 11, 2012 at 3:13 AM,<[email protected]> wrote:
meta/classes/archiver.bbclass +4 -0
index 59b58f4..a720db2 100644
@@ -6,6 +6,10 @@ 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'
+export SOURCE_ARCHIVE_LOG_WITH_SCRIPTS
+export SOURCE_ARCHIVE_PACKAGE_TYPE

I don't think you understand what 'export' does or why it exists. Please fix that, and remove these lines. Thanks.

Hi Chris Larson,
Thanks for your review. I am testing this according to your
suggestion and put it to OE-core after test.

Thanks
Yan