diff options
author | Adam Spiers <stow@adamspiers.org> | 2015-01-01 19:02:46 +0000 |
---|---|---|
committer | Adam Spiers <stow@adamspiers.org> | 2015-01-01 19:02:46 +0000 |
commit | 7b43622dd9ff7b8793d1c08727f84ac5069d3fb4 (patch) | |
tree | a19760b9facaaa7ad29f604913b9bfd11adfe641 /lib/Stow.pm.in | |
parent | 5be496a795eae8a139105d57fa98a9fcb172a122 (diff) | |
download | stow-7b43622dd9ff7b8793d1c08727f84ac5069d3fb4.tar.gz |
fix stowing of relative links when --no-folding is used
With a tree like this:
.
|-- stow
| `-- pkg
| `-- lib
| |-- itk-current -> itk4.0.0
| `-- itk4.0.0
| `-- libitk4.0.0.so
`-- target
`-- lib
|-- itk4.0.0 -> ../../stow/pkg/lib/itk4.0.0
`-- libfoo-1.2.3.so
stowing pkg with the --no-folding option resulted in itk-current
being "unpacked":
.
`-- target
`-- lib
|-- itk-current
| `-- libitk4.0.0.so -> ../../../stow/pkg/lib/itk-current/libitk4.0.0.so
|-- itk4.0.0
| `-- libitk4.0.0.so -> ../../../stow/pkg/lib/itk4.0.0/libitk4.0.0.so
`-- libfoo-1.2.3.so
This commit fixes it so that it gets stowed as a symlink:
.
`-- target
`-- lib
...
|-- itk-current -> ../../stow/pkg/lib/itk-current
...
Thanks to Gabriele Balducci for reporting this problem:
http://thread.gmane.org/gmane.comp.gnu.stow.general/6676
Diffstat (limited to 'lib/Stow.pm.in')
-rwxr-xr-x | lib/Stow.pm.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in index 2e0b71e..851bb86 100755 --- a/lib/Stow.pm.in +++ b/lib/Stow.pm.in @@ -520,7 +520,7 @@ sub stow_node { } } } - elsif ($self->{'no-folding'} && -d $path) { + elsif ($self->{'no-folding'} && -d $path && ! -l $path) { $self->do_mkdir($target); $self->stow_contents( $self->{stow_path}, |