From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] sanity.bbclass: Fix broken indentation leading to code being skipped unintentionally
Date: Tue, 30 Aug 2011 17:19:39 +0100 [thread overview]
Message-ID: <1314721179.5939.362.camel@rex> (raw)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index cefe6a4..b266968 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -197,25 +197,25 @@ def check_sanity(e):
if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
- # Check we are using a valid lacal.conf
- current_conf = data.getVar('CONF_VERSION', e.data, True)
- conf_version = data.getVar('LOCALCONF_VERSION', e.data, True)
-
- if current_conf != conf_version:
- messages = messages + "Your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes.\n"
-
- # Check bblayers.conf is valid
- current_lconf = data.getVar('LCONF_VERSION', e.data, True)
- lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True)
- if current_lconf != lconf_version:
- messages = messages + "Your version of bblayers.conf was generated from an older version of bblayers.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/bblayers.conf conf/bblayers.conf.sample\" is a good way to visualise the changes.\n"
-
- # If we have a site.conf, check it's valid
- if check_conf_exists("conf/site.conf", e.data):
- current_sconf = data.getVar('SCONF_VERSION', e.data, True)
- sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
- if current_sconf != sconf_version:
- messages = messages + "Your version of site.conf was generated from an older version of site.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/site.conf conf/site.conf.sample\" is a good way to visualise the changes.\n"
+ # Check we are using a valid lacal.conf
+ current_conf = data.getVar('CONF_VERSION', e.data, True)
+ conf_version = data.getVar('LOCALCONF_VERSION', e.data, True)
+
+ if current_conf != conf_version:
+ messages = messages + "Your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes.\n"
+
+ # Check bblayers.conf is valid
+ current_lconf = data.getVar('LCONF_VERSION', e.data, True)
+ lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True)
+ if current_lconf != lconf_version:
+ messages = messages + "Your version of bblayers.conf was generated from an older version of bblayers.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/bblayers.conf conf/bblayers.conf.sample\" is a good way to visualise the changes.\n"
+
+ # If we have a site.conf, check it's valid
+ if check_conf_exists("conf/site.conf", e.data):
+ current_sconf = data.getVar('SCONF_VERSION', e.data, True)
+ sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
+ if current_sconf != sconf_version:
+ messages = messages + "Your version of site.conf was generated from an older version of site.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/site.conf conf/site.conf.sample\" is a good way to visualise the changes.\n"
assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
# Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
reply other threads:[~2011-08-30 16:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314721179.5939.362.camel@rex \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox