diff options
| author | Ross Burton <ross@openedhand.com> | 2006-10-02 16:06:08 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2006-10-02 16:06:08 +0000 |
| commit | dade587c81e34950cdeddc022954b32bc70f6f24 (patch) | |
| tree | 54902adb9c77c7d46b182d36163979b1c7ce611f /meta | |
| parent | 16bcfe9956590afbcc41d995b70f48e46beadfde (diff) | |
| download | openembedded-core-dade587c81e34950cdeddc022954b32bc70f6f24.tar.gz openembedded-core-dade587c81e34950cdeddc022954b32bc70f6f24.tar.bz2 openembedded-core-dade587c81e34950cdeddc022954b32bc70f6f24.tar.xz openembedded-core-dade587c81e34950cdeddc022954b32bc70f6f24.zip | |
Don't nest os.path.join() calls
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@784 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 4526ac156..de93593c9 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -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") diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index cb4448485..f297381f8 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -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") |