diff options
author | Rob Kendrick <rob.kendrick@codethink.co.uk> | 2014-07-29 12:43:56 +0000 |
---|---|---|
committer | Rob Kendrick <rob.kendrick@codethink.co.uk> | 2014-07-29 12:43:56 +0000 |
commit | 35cb4e29f0cbba43bdf9d0b7363e942125399fd3 (patch) | |
tree | ea9cfbf1e6f6a8ef39c393e4ecbf781b6df93f47 | |
parent | 7859eb2c3045650e004f65ec7333a8357a3f8215 (diff) | |
parent | 18ba01bac46fa19ad6fa6076b987d951058bd9fc (diff) | |
download | morph-baserock/robkendrick/mips64.tar.gz |
Merge remote-tracking branch 'origin/baserock/richardmaw/bugfix/symlink-include' into baserock/robkendrick/mips64baserock/robkendrick/mips64
-rw-r--r-- | morphlib/builder2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 4bb435d9..d739dc13 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -488,7 +488,7 @@ class ChunkBuilder(BuilderBase): def filepaths(destdir): for dirname, subdirs, basenames in os.walk(destdir): subdirsymlinks = [os.path.join(dirname, x) for x in subdirs - if os.path.islink(x)] + if os.path.islink(os.path.join(dirname, x))] filenames = [os.path.join(dirname, x) for x in basenames] for relpath in (os.path.relpath(x, destdir) for x in [dirname] + subdirsymlinks + filenames): |