[oe-commits] [openembedded-core] 07/28: classes/sanity: use proper multi-line string literals
git at git.openembedded.org
git at git.openembedded.org
Sat Mar 26 08:04:16 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 0eb5c7836246c55435880d5587959026d783ac31
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Mar 24 22:40:08 2016 +1300
classes/sanity: use proper multi-line string literals
A python string literal isn't meant to be split over multiple lines
unless it is explicitly multi-line. Use three quotes to indicate that.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/sanity.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 900d97a..a400bca 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -42,7 +42,7 @@ python oecore_update_localconf() {
current_conf = d.getVar('CONF_VERSION', True)
conf_version = d.getVar('LOCALCONF_VERSION', True)
- failmsg = "Your version of local.conf was generated from an older/newer version of
+ failmsg = """Your version of local.conf was generated from an older/newer 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.
@@ -50,7 +50,7 @@ Matching the version numbers will remove this message.
\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
-is a good way to visualise the changes."
+is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
raise NotImplementedError(failmsg)
@@ -62,7 +62,7 @@ python oecore_update_siteconf() {
current_sconf = d.getVar('SCONF_VERSION', True)
sconf_version = d.getVar('SITE_CONF_VERSION', True)
- failmsg = "Your version of site.conf was generated from an older version of
+ failmsg = """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.
@@ -70,7 +70,7 @@ Matching the version numbers will remove this message.
\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
-is a good way to visualise the changes."
+is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
raise NotImplementedError(failmsg)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list