package.bbclass: support dangling path components

Commit ec2aab09769f4b6817d74d2175afa2b7c7598750 introduced a regression
on packages which contain symlinks with unresolvable path components
(e.g. lsof-dbg).  While assigning a variable, an exception was raised
and the exception handler accessed this variable.

Patch deals both with the dangling path components by assuming them as
valid directories and by avoiding the broken assignment.

(From OE-Core rev: 579369b0fb27fad6d628746a50b9b798078500f6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Enrico Scholz
2013-02-11 20:21:53 +01:00
committed by Richard Purdie
parent 00a2411470
commit d518019d6c

View File

@@ -1000,12 +1000,8 @@ python package_fixsymlinks () {
for path in pkgfiles[pkg]:
rpath = path[len(inst_root):]
pkg_files[pkg].append(rpath)
try:
rtarget = oe.path.realpath(path, inst_root, True)
os.lstat(rtarget)
except OSError, (err, strerror):
if err != errno.ENOENT:
raise
rtarget = oe.path.realpath(path, inst_root, True, assume_dir = True)
if not os.path.lexists(rtarget):
dangling_links[pkg].append(os.path.normpath(rtarget[len(inst_root):]))
newrdepends = {}