bitbake: utils: use logger.warn instead of print in copyfile
print disappears into the ether, so use logger.warn and clean up the messages. (Bitbake rev: 90f91f7402ff69f3fe9fba5f94a53d371303ce34) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0b9c3393c1
commit
95915910df
|
@ -724,7 +724,7 @@ def copyfile(src, dest, newmtime = None, sstat = None):
|
||||||
if not sstat:
|
if not sstat:
|
||||||
sstat = os.lstat(src)
|
sstat = os.lstat(src)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("copyfile: Stating source file failed...", e)
|
logger.warn("copyfile: stat of %s failed (%s)" % (src, e))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
destexists = 1
|
destexists = 1
|
||||||
|
@ -751,7 +751,7 @@ def copyfile(src, dest, newmtime = None, sstat = None):
|
||||||
#os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
|
#os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
|
||||||
return os.lstat(dest)
|
return os.lstat(dest)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("copyfile: failed to properly create symlink:", dest, "->", target, e)
|
logger.warn("copyfile: failed to create symlink %s to %s (%s)" % (dest, target, e))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if stat.S_ISREG(sstat[stat.ST_MODE]):
|
if stat.S_ISREG(sstat[stat.ST_MODE]):
|
||||||
|
@ -766,7 +766,7 @@ def copyfile(src, dest, newmtime = None, sstat = None):
|
||||||
shutil.copyfile(src, dest + "#new")
|
shutil.copyfile(src, dest + "#new")
|
||||||
os.rename(dest + "#new", dest)
|
os.rename(dest + "#new", dest)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print('copyfile: copy', src, '->', dest, 'failed.', e)
|
logger.warn("copyfile: copy %s to %s failed (%s)" % (src, dest, e))
|
||||||
return False
|
return False
|
||||||
finally:
|
finally:
|
||||||
if srcchown:
|
if srcchown:
|
||||||
|
@ -777,13 +777,13 @@ def copyfile(src, dest, newmtime = None, sstat = None):
|
||||||
#we don't yet handle special, so we need to fall back to /bin/mv
|
#we don't yet handle special, so we need to fall back to /bin/mv
|
||||||
a = getstatusoutput("/bin/cp -f " + "'" + src + "' '" + dest + "'")
|
a = getstatusoutput("/bin/cp -f " + "'" + src + "' '" + dest + "'")
|
||||||
if a[0] != 0:
|
if a[0] != 0:
|
||||||
print("copyfile: Failed to copy special file:" + src + "' to '" + dest + "'", a)
|
logger.warn("copyfile: failed to copy special file %s to %s (%s)" % (src, dest, a))
|
||||||
return False # failure
|
return False # failure
|
||||||
try:
|
try:
|
||||||
os.lchown(dest, sstat[stat.ST_UID], sstat[stat.ST_GID])
|
os.lchown(dest, sstat[stat.ST_UID], sstat[stat.ST_GID])
|
||||||
os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
|
os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("copyfile: Failed to chown/chmod/unlink", dest, e)
|
logger.warn("copyfile: failed to chown/chmod %s (%s)" % (dest, e))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if newmtime:
|
if newmtime:
|
||||||
|
|
Loading…
Reference in New Issue