mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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:
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user