summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Urbanec <openembedded-devel@urbanec.net>2014-10-15 23:08:17 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-18 16:14:04 +0200
commit754288c387b058843d0885fc7e02b4a34e2b3aab (patch)
treebe2ed66303ac71f52a1c37bd69a38196d27724ee
parent0d761fc4ff00d9e5dd420bf84a20c67bed4c6634 (diff)
downloadpoky-754288c387b058843d0885fc7e02b4a34e2b3aab.tar.gz
poky-754288c387b058843d0885fc7e02b4a34e2b3aab.tar.bz2
poky-754288c387b058843d0885fc7e02b4a34e2b3aab.zip
sstate.bbclass: Fix up white space lost in last commit.
Commit e9672387 split one long line into a multi-line string, but in the process white space between words was lost. This results in badly formatted output when this message is printed. (From OE-Core rev: b145374c0a498de0160a9b81f50ce0066ab14862) Signed-off-by: Peter Urbanec <openembedded-devel@urbanec.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass40
1 files changed, 20 insertions, 20 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index f8695e7e9b..ace6bdb57a 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -193,26 +193,26 @@ def sstate_install(ss, d):
if search_output != "":
match.append("Matched in %s" % search_output.rstrip())
if match:
- bb.error("The recipe %s is trying to install files into a shared" \
- "area when those files already exist. Those files and their manifest" \
- "location are:\n %s\nPlease verify which recipe should provide the" \
- "above files.\nThe build has stopped as continuing in this scenario WILL" \
- "break things, if not now, possibly in the future (we've seen builds fail" \
- "several months later). If the system knew how to recover from this" \
- "automatically it would however there are several different scenarios" \
- "which can result in this and we don't know which one this is. It may be" \
- "you have switched providers of something like virtual/kernel (e.g. from" \
- "linux-yocto to linux-yocto-dev), in that case you need to execute the" \
- "clean task for both recipes and it will resolve this error. It may be" \
- "you changed DISTRO_FEATURES from systemd to udev or vice versa. Cleaning" \
- "those recipes should again resolve this error however switching" \
- "DISTRO_FEATURES on an existing build directory is not supported, you" \
- "should really clean out tmp and rebuild (reusing sstate should be safe)." \
- "It could be the overlapping files detected are harmless in which case" \
- "adding them to SSTATE_DUPWHITELIST may be the correct solution. It could" \
- "also be your build is including two different conflicting versions of" \
- "things (e.g. bluez 4 and bluez 5 and the correct solution for that would" \
- "be to resolve the conflict. If in doubt, please ask on the mailing list," \
+ bb.error("The recipe %s is trying to install files into a shared " \
+ "area when those files already exist. Those files and their manifest " \
+ "location are:\n %s\nPlease verify which recipe should provide the " \
+ "above files.\nThe build has stopped as continuing in this scenario WILL " \
+ "break things, if not now, possibly in the future (we've seen builds fail " \
+ "several months later). If the system knew how to recover from this " \
+ "automatically it would however there are several different scenarios " \
+ "which can result in this and we don't know which one this is. It may be " \
+ "you have switched providers of something like virtual/kernel (e.g. from " \
+ "linux-yocto to linux-yocto-dev), in that case you need to execute the " \
+ "clean task for both recipes and it will resolve this error. It may be " \
+ "you changed DISTRO_FEATURES from systemd to udev or vice versa. Cleaning " \
+ "those recipes should again resolve this error however switching " \
+ "DISTRO_FEATURES on an existing build directory is not supported, you " \
+ "should really clean out tmp and rebuild (reusing sstate should be safe). " \
+ "It could be the overlapping files detected are harmless in which case " \
+ "adding them to SSTATE_DUPWHITELIST may be the correct solution. It could " \
+ "also be your build is including two different conflicting versions of " \
+ "things (e.g. bluez 4 and bluez 5 and the correct solution for that would " \
+ "be to resolve the conflict. If in doubt, please ask on the mailing list, " \
"sharing the error and filelist above." % \
(d.getVar('PN', True), "\n ".join(match)))
bb.fatal("If the above message is too much, the simpler version is you're advised to wipe out tmp and rebuild (reusing sstate is fine). That will likely fix things in most (but not all) cases.")