From: Phil Blundell <philb@gnu.org>
Date: Tue, 9 Feb 2010 11:33:09 +0000 (+0000)
Subject: sanity: correct misleading message about location of TMPDIR
X-Git-Tag: Release-2010-05/1~533
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17c810af40dfbf084ef87c9b2a92874af43a6fe7;p=openembedded.git

sanity: correct misleading message about location of TMPDIR

There is no point in telling users to move TMPDIR "back" to its current location :-}
---

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index f57d8e47d0..b66c9a9877 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -135,8 +135,9 @@ def check_sanity(e):
 	checkfile = os.path.join(tmpdir, "saved_tmpdir")
 	if os.path.exists(checkfile):
 		f = file(checkfile, "r")
-		if (f.read().strip() != tmpdir):
-			messages = messages + "Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % tmpdir
+		oldpath = f.read().strip()
+		if (oldpath != tmpdir):
+			messages = messages + "Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % oldpath
 	else:
 		import bb
 		bb.mkdirhier(tmpdir)