diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-03-24 22:40:08 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:55:48 +0100 |
commit | 39170fe6f1a20f03ff3a5d189b6795e808c41124 (patch) | |
tree | 2224011d1b82b88631cb2e12fda0b135d6a66e68 /meta/classes | |
parent | 33a6135294f2082710915fd2d8e1c457af284784 (diff) | |
download | poky-39170fe6f1a20f03ff3a5d189b6795e808c41124.tar.gz |
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.
(From OE-Core rev: 8cdb505bb3d9748be1744f36cbbfb4f62fa20b67)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sanity.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 900d97a33e..a400bcadd0 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -42,7 +42,7 @@ python oecore_update_localconf() { | |||
42 | current_conf = d.getVar('CONF_VERSION', True) | 42 | current_conf = d.getVar('CONF_VERSION', True) |
43 | conf_version = d.getVar('LOCALCONF_VERSION', True) | 43 | conf_version = d.getVar('LOCALCONF_VERSION', True) |
44 | 44 | ||
45 | failmsg = "Your version of local.conf was generated from an older/newer version of | 45 | failmsg = """Your version of local.conf was generated from an older/newer version of |
46 | local.conf.sample and there have been updates made to this file. Please compare the two | 46 | local.conf.sample and there have been updates made to this file. Please compare the two |
47 | files and merge any changes before continuing. | 47 | files and merge any changes before continuing. |
48 | 48 | ||
@@ -50,7 +50,7 @@ Matching the version numbers will remove this message. | |||
50 | 50 | ||
51 | \"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\" | 51 | \"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\" |
52 | 52 | ||
53 | is a good way to visualise the changes." | 53 | is a good way to visualise the changes.""" |
54 | failmsg = d.expand(failmsg) | 54 | failmsg = d.expand(failmsg) |
55 | 55 | ||
56 | raise NotImplementedError(failmsg) | 56 | raise NotImplementedError(failmsg) |
@@ -62,7 +62,7 @@ python oecore_update_siteconf() { | |||
62 | current_sconf = d.getVar('SCONF_VERSION', True) | 62 | current_sconf = d.getVar('SCONF_VERSION', True) |
63 | sconf_version = d.getVar('SITE_CONF_VERSION', True) | 63 | sconf_version = d.getVar('SITE_CONF_VERSION', True) |
64 | 64 | ||
65 | failmsg = "Your version of site.conf was generated from an older version of | 65 | failmsg = """Your version of site.conf was generated from an older version of |
66 | site.conf.sample and there have been updates made to this file. Please compare the two | 66 | site.conf.sample and there have been updates made to this file. Please compare the two |
67 | files and merge any changes before continuing. | 67 | files and merge any changes before continuing. |
68 | 68 | ||
@@ -70,7 +70,7 @@ Matching the version numbers will remove this message. | |||
70 | 70 | ||
71 | \"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\" | 71 | \"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\" |
72 | 72 | ||
73 | is a good way to visualise the changes." | 73 | is a good way to visualise the changes.""" |
74 | failmsg = d.expand(failmsg) | 74 | failmsg = d.expand(failmsg) |
75 | 75 | ||
76 | raise NotImplementedError(failmsg) | 76 | raise NotImplementedError(failmsg) |