[PATCH 0/1] Fix incorrect string literal quoting

[PATCH 0/1] Fix incorrect string literal quoting

[Paul Eggleton]

The following changes since commit 34e7292fb40635cee1f1237ac3156530f8dfce37:

  parselogs: add new whitelist entries to address 4.4.3 issues (2016-03-22 08:53:49 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/sanityfix1
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/sanityfix1

Paul Eggleton (1):
  classes/sanity: use proper multi-line string literals

 meta/classes/sanity.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.5.5

[PATCH 1/1] classes/sanity: use proper multi-line string literals

[Paul Eggleton]

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@linux.intel.com>
---
 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 e72a007..d34605f 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)
-- 
2.5.5