[oe-commits] Chris Larson : Revert "base.bbclass: fix bug with absolute file:// uris"

git version control git at git.openembedded.org
Tue Aug 31 14:31:27 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7b4cb64edce429f03cb4802f7df94f52176e4a23
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7b4cb64edce429f03cb4802f7df94f52176e4a23

Author: Chris Larson <chris_larson at mentor.com>
Date:   Tue Aug 31 07:29:38 2010 -0700

Revert "base.bbclass: fix bug with absolute file:// uris"

Drop this for now, as it breaks other things.  Of course, without this, you
once again can no longer have absolute file:// paths the way we used to be
able to.  Will look into it further.

This reverts commit 599b03fe999d41114d124ce663b6c59fa57256d8.

---

 classes/base.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 0d8630e..afc30da 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -231,9 +231,9 @@ def oe_unpack_file(file, data, url = None):
 	if not cmd:
 		return True
 	if not host:
-		dest = oe.path.join(os.getcwd(), path)
+		dest = os.path.join(os.getcwd(), path)
 	else:
-		dest = oe.path.join(os.getcwd(), oe.path.join(host, path))
+		dest = os.path.join(os.getcwd(), os.path.join(host, path))
 	if os.path.exists(dest):
 		if os.path.samefile(file, dest):
 			return True





More information about the Openembedded-commits mailing list