diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-30 14:52:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 19:38:30 +0100 |
commit | 8c1c37a149c02c5146a689d7c50750af8394d01d (patch) | |
tree | fc3909883c3d96777df017f68cdc77fdfa2ffd38 /meta | |
parent | c7869b4d4cade8e87e9aab9e27c07bbc6fed39fe (diff) | |
download | poky-8c1c37a149c02c5146a689d7c50750af8394d01d.tar.gz |
sanity.bbclass: Fix broken indentation leading to code being skipped unintentionally
(From OE-Core rev: 5200d38222c3188e695080b45b975daa20c8a9fa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sanity.bbclass | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index cefe6a483e..b266968095 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -197,25 +197,25 @@ def check_sanity(e): | |||
197 | if data.getVar('TARGET_OS', e.data, True) == 'INVALID': | 197 | if data.getVar('TARGET_OS', e.data, True) == 'INVALID': |
198 | messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n' | 198 | messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n' |
199 | 199 | ||
200 | # Check we are using a valid lacal.conf | 200 | # Check we are using a valid lacal.conf |
201 | current_conf = data.getVar('CONF_VERSION', e.data, True) | 201 | current_conf = data.getVar('CONF_VERSION', e.data, True) |
202 | conf_version = data.getVar('LOCALCONF_VERSION', e.data, True) | 202 | conf_version = data.getVar('LOCALCONF_VERSION', e.data, True) |
203 | 203 | ||
204 | if current_conf != conf_version: | 204 | if current_conf != conf_version: |
205 | 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" | 205 | 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" |
206 | 206 | ||
207 | # Check bblayers.conf is valid | 207 | # Check bblayers.conf is valid |
208 | current_lconf = data.getVar('LCONF_VERSION', e.data, True) | 208 | current_lconf = data.getVar('LCONF_VERSION', e.data, True) |
209 | lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True) | 209 | lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True) |
210 | if current_lconf != lconf_version: | 210 | if current_lconf != lconf_version: |
211 | 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" | 211 | 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" |
212 | 212 | ||
213 | # If we have a site.conf, check it's valid | 213 | # If we have a site.conf, check it's valid |
214 | if check_conf_exists("conf/site.conf", e.data): | 214 | if check_conf_exists("conf/site.conf", e.data): |
215 | current_sconf = data.getVar('SCONF_VERSION', e.data, True) | 215 | current_sconf = data.getVar('SCONF_VERSION', e.data, True) |
216 | sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True) | 216 | sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True) |
217 | if current_sconf != sconf_version: | 217 | if current_sconf != sconf_version: |
218 | 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" | 218 | 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" |
219 | 219 | ||
220 | assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split() | 220 | assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split() |
221 | # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf | 221 | # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf |