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

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@784 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 4526ac156c1c15cdf79f7d737edac9cf7d258bfb..de93593c95a4237f663738b41057f211ceb99fc0 100644 (file)
--- 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 cb44484855e2bef033cbcce89810d40c27242c30..f297381f87b27fe23d1e7888e3989969e8b32ac4 100644 (file)
--- 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")