sanity: clarify error message if TMPDIR moves

Message ID 20190405200005.29748-1-ross.burton@intel.com
State Accepted
Commit 36805a628f8208ff6d7fba9955c5fb1ed6396395
Headers show
Series
  • sanity: clarify error message if TMPDIR moves
Related show

Commit Message

Ross Burton April 5, 2019, 8 p.m.
If TMPDIR is moved the error message says "move it back or rebuild" but the
obvious rebuild method of running 'bitbake [recipe]] -cclean' fails with the
same error.

Make it clear what we mean by adding "delete and".

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/classes/sanity.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index cab09214014..4cbb1f3a61f 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -876,7 +876,7 @@  def check_sanity_everybuild(status, d):
         with open(checkfile, "r") as f:
             saved_tmpdir = f.read().strip()
             if (saved_tmpdir != tmpdir):
-                status.addresult("Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % saved_tmpdir)
+                status.addresult("Error, TMPDIR has changed location. You need to either move it back to %s or delete it and rebuild\n" % saved_tmpdir)
     else:
         bb.utils.mkdirhier(tmpdir)
         # Remove setuid, setgid and sticky bits from TMPDIR