[oe-commits] org.oe.dev package_ipk.bbclass: Simplify os.path.join calls (from poky)

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: c647d36367af59b2cc5bdd6d28a4c0a873539f76
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c647d36367af59b2cc5bdd6d28a4c0a873539f76
Files:
1
classes/package_ipk.bbclass
Diffs:

#
# mt diff -r01b05c1b4eeb1afa518a23a3db8bc76bf85aad8a -rc647d36367af59b2cc5bdd6d28a4c0a873539f76
#
# 
# 
# patch "classes/package_ipk.bbclass"
#  from [5d149a3ccb468f3ee0310fc0c2fb61e5485bd3e1]
#    to [00142a95448e95b3999246fca33b4c70d72e0b53]
# 
============================================================
--- classes/package_ipk.bbclass	5d149a3ccb468f3ee0310fc0c2fb61e5485bd3e1
+++ classes/package_ipk.bbclass	00142a95448e95b3999246fca33b4c70d72e0b53
@@ -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")