Skip to contentSkip to conversation

Minor fix for SANITY_TESTED_DISTROS feature

PATCH Applied Paul Eggleton 2 participants 3 messages Sep 1, 2011 – Sep 2, 2011

lore
Share & tools
lore
#0 lore raw

cover Minor fix for SANITY_TESTED_DISTROS feature

The following changes since commit bf9e9961ec4e7b2d10f25b550b902df62b3939b1:

Fix powerpc term and provide more template for different arches (2011-08-31 20:10:14 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/tested-distro-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/tested-distro-fix

Paul Eggleton (1):
sanity.bbclass: fix splitting on newlines of SANITY_TESTED_DISTROS

 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 sanity.bbclass: fix splitting on newlines of SANITY_TESTED_DISTROS

This variable should be split with \n sequences and these need to be specified literally in the string. A corrected version of the example given in the original commit (OE-core rev 75e3875341ddc8940e9ee2ccbbb2ec18194a68e6):

SANITY_TESTED_DISTROS = " \
        Ubuntu 11.04 \n \
        Fedora release 14 (Laughlin) \n \
        "
---
 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/sanity.bbclass +1 -1
index 37b9028..44b0688 100644
@@ -149,7 +149,7 @@ def check_supported_distro(e):
                 finally:
                     f.close()
     if distro:
-        if distro not in [x.strip() for x in tested_distros.split('\n')]:
+        if distro not in [x.strip() for x in tested_distros.split('\\n')]:
             bb.warn('Host distribution "%s" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.' % distro)
     else:
         bb.warn('Host distribution could not be determined; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.')
Signature · 1 line
1.7.4.1
#2 lore raw

Re: [PATCH 1/1] sanity.bbclass: fix splitting on newlines of SANITY_TESTED_DISTROS

Quoted 10 lines · Paul Eggleton

This variable should be split with \n sequences and these need to be specified literally in the string. A corrected version of the example given in the original commit (OE-core rev 75e3875341ddc8940e9ee2ccbbb2ec18194a68e6):

SANITY_TESTED_DISTROS = " \
        Ubuntu 11.04 \n \
        Fedora release 14 (Laughlin) \n \
        "
Quoted 4 lines
---
 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard