From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 20 Nov 2006 14:32:35 +0000 (+0000)
Subject: package_ipk.bbclass: Simplify os.path.join calls (from poky)
X-Git-Tag: Release-2010-05/1~9453^2~399^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f125e6a40c1978258f5a0ae2937d642b4d6705;p=openembedded.git

package_ipk.bbclass: Simplify os.path.join calls (from poky)
---

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 02bac7d62b..278898444d 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -46,11 +46,11 @@ python package_ipk_install () {
 
 
 	if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or
-		not os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK)):
+		not os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK)):
 		ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
 		if (ret != 0 ):
 			raise bb.build.FuncFailed
-		f=open(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),"w")
+		f=open(os.path.join(tmpdir, "stamps" ,"do_packages"),"w")
 		f.close()
 
 	ret = os.system('ipkg-cl  -o %s -f %s update' % (rootfs, conffile))
@@ -89,8 +89,8 @@ python do_package_ipk () {
 
 	tmpdir = bb.data.getVar('TMPDIR', d, 1)
 	# Invalidate the packages file
-	if os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK):
-		os.unlink(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"))
+	if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK):
+		os.unlink(os.path.join(tmpdir, "stamps" ,"do_packages"))
 
 	if packages == []:
 		bb.debug(1, "No packages; nothing to do")