[Angstrom-devel] [PATCH] angstrom-version.bb: fix LexToken(TOKEN, 'nobranch', 0, 0) error

2011-11-14 Thread Bernhard Guillon 
Strip braces from git revision string e.g. from (no branch)
to not confuse the tokenizing. Without the following error
occures on a detached (no branch) git branch :

  File sources/bitbake/lib/bb/pysh/pyshyacc.py, line 646, in 
p_error(p=LexToken(TOKEN,'nobranch',0,0)):
 w('  %r\n' % n)
raise sherrors.ShellSyntaxError(''.join(msg))

ShellSyntaxError: LexToken(TOKEN,'nobranch',0,0)
followed by:
  LexToken(RPARENS,')',0,0)
  LexToken(TOKEN,':5260401eb0cfe37a7358296866b4b43a167817ff\nmeta  
= ',0,0)
  LexToken(LPARENS,'(',0,0)
  LexToken(TOKEN,'nobranch',0,0)
  LexToken(RPARENS,')',0,0)

Signed-off-by: Bernhard Guillon bernhard.guil...@hale.at
---
 recipes-angstrom/angstrom/angstrom-version.bb |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-angstrom/angstrom/angstrom-version.bb 
b/recipes-angstrom/angstrom/angstrom-version.bb
index eb3eade..c91db4a 100644
--- a/recipes-angstrom/angstrom/angstrom-version.bb
+++ b/recipes-angstrom/angstrom/angstrom-version.bb
@@ -2,7 +2,7 @@ LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58
 
 PV = ${DISTRO_VERSION}
-PR = r10
+PR = r11
 PE = 2
 
 SRC_URI = file://lsb_release
@@ -13,7 +13,7 @@ PACKAGE_ARCH = ${MACHINE_ARCH}
 def get_layers(bb, d):
layers = (bb.data.getVar(BBLAYERS, d, 1) or ).split()
layers_branch_rev = [%-17s = \%s:%s\ % (os.path.basename(i), \
-   base_get_metadata_git_branch(i, None).strip(), \
+   base_get_metadata_git_branch(i, None).strip().strip('()'), \
base_get_metadata_git_revision(i, None)) \
for i in layers]
i = len(layers_branch_rev)-1
-- 
1.7.1



--
Scanned by MailScanner.


___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel

Re: [Angstrom-devel] [PATCH] angstrom-version.bb: fix LexToken(TOKEN, 'nobranch', 0, 0) error

2011-11-14 Thread Koen Kooi 
Applied, thanks!

Op 14 nov. 2011, om 11:35 heeft Bernhard Guillon het volgende geschreven:

 Strip braces from git revision string e.g. from (no branch)
 to not confuse the tokenizing. Without the following error
 occures on a detached (no branch) git branch :
 
  File sources/bitbake/lib/bb/pysh/pyshyacc.py, line 646, in 
 p_error(p=LexToken(TOKEN,'nobranch',0,0)):
 w('  %r\n' % n)
   raise sherrors.ShellSyntaxError(''.join(msg))
 
 ShellSyntaxError: LexToken(TOKEN,'nobranch',0,0)
 followed by:
  LexToken(RPARENS,')',0,0)
  LexToken(TOKEN,':5260401eb0cfe37a7358296866b4b43a167817ff\nmeta 
  = ',0,0)
  LexToken(LPARENS,'(',0,0)
  LexToken(TOKEN,'nobranch',0,0)
  LexToken(RPARENS,')',0,0)
 
 Signed-off-by: Bernhard Guillon bernhard.guil...@hale.at
 ---
 recipes-angstrom/angstrom/angstrom-version.bb |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/recipes-angstrom/angstrom/angstrom-version.bb 
 b/recipes-angstrom/angstrom/angstrom-version.bb
 index eb3eade..c91db4a 100644
 --- a/recipes-angstrom/angstrom/angstrom-version.bb
 +++ b/recipes-angstrom/angstrom/angstrom-version.bb
 @@ -2,7 +2,7 @@ LICENSE = MIT
 LIC_FILES_CHKSUM = 
 file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58
 
 PV = ${DISTRO_VERSION}
 -PR = r10
 +PR = r11
 PE = 2
 
 SRC_URI = file://lsb_release
 @@ -13,7 +13,7 @@ PACKAGE_ARCH = ${MACHINE_ARCH}
 def get_layers(bb, d):
   layers = (bb.data.getVar(BBLAYERS, d, 1) or ).split()
   layers_branch_rev = [%-17s = \%s:%s\ % (os.path.basename(i), \
 - base_get_metadata_git_branch(i, None).strip(), \
 + base_get_metadata_git_branch(i, None).strip().strip('()'), \
   base_get_metadata_git_revision(i, None)) \
   for i in layers]
   i = len(layers_branch_rev)-1
 -- 
 1.7.1
 
 
 
 --
 Scanned by MailScanner.
 
 
 ___
 Angstrom-distro-devel mailing list
 Angstrom-distro-devel@linuxtogo.org
 http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel



signature.asc
Description: Message signed with OpenPGP using GPGMail
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel