summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-04-12 15:56:45 +0100
committerJoshua Lock <josh@linux.intel.com>2010-04-12 15:56:45 +0100
commitd3fbb56c2ffa44e2da15ca4bfa4def35792ab6f7 (patch)
treee9c51ee3658a83403b9bbb395b363d4d9c2f0979
parent4f1ec3194dbad9165aacac95edddc44940181499 (diff)
downloadpoky-d3fbb56c2ffa44e2da15ca4bfa4def35792ab6f7.tar.gz
relocatable.bbclass: Actually skip symlinks
The previous patch to do so was badly merged and didn't actually skip all symlinks, only ones which where not an absolute path... Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/classes/relocatable.bbclass6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass
index 6954f2d967..36545530c7 100644
--- a/meta/classes/relocatable.bbclass
+++ b/meta/classes/relocatable.bbclass
@@ -19,10 +19,8 @@ def process_dir (directory, d):
19 for file in dirs: 19 for file in dirs:
20 fpath = directory + "/" + file 20 fpath = directory + "/" + file
21 if os.path.islink(fpath): 21 if os.path.islink(fpath):
22 fpath = os.readlink(fpath) 22 # Skip symlinks
23 if not os.path.isabs(fpath): 23 continue
24 # Skip symlinks
25 continue
26 24
27 if os.path.isdir(fpath): 25 if os.path.isdir(fpath):
28 process_dir(fpath, d) 26 process_dir(fpath, d)