sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Don't nest os.path.join() calls 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@784 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton 2006-10-02 16:06:08 +00:00
parent 16bcfe9956
commit dade587c81
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/package_deb.bbclass
View File

@ -35,7 +35,7 @@ python do_package_deb_install () {
if (exitstatus != 0 ):
raise bb.build.FuncFailed(output)
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()
# NOTE: this env stuff is racy at best, we need something more capable
@ -86,8 +86,8 @@ python do_package_deb () {
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")

8
meta/classes/package_ipk.bbclass
View File

@ -48,11 +48,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))
@ -91,8 +91,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")