diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-07-29 13:21:46 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-07-29 13:21:46 +0000 |
commit | dfc9a628cd8c0d7e3fe040a1e337c41c95fbc8c6 (patch) | |
tree | 7d3507b7c7d83663813d8fcd852e0aa472f307a0 /morphlib/builder2.py | |
parent | 2c61412b43d2a30ac237ee3d03a61fc647fed0ba (diff) | |
parent | 18ba01bac46fa19ad6fa6076b987d951058bd9fc (diff) | |
download | morph-dfc9a628cd8c0d7e3fe040a1e337c41c95fbc8c6.tar.gz |
Merge branch 'baserock/richardmaw/bugfix/symlink-include'
Reviewed-by: Daniel Silverstone
Diffstat (limited to 'morphlib/builder2.py')
-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): |