00dani/stow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Trace individual cases separately when skipping stow dirs during unstow.

Browse source
This commit is contained in:
Adam Spiers 2011-11-18 10:33:08 +00:00
parent 5db0c0bbf7
commit c26e62de43
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
stow.in
View file

@ -543,6 +543,33 @@ sub stow_node {
return; return;
} }
#===== SUBROUTINE ===========================================================
# Name : should_skip_stow_dir_target()
# Purpose : determine whether target is a stow directory and should be skipped
# Parameters: $target => relative path to symlink target from the current directory
# Returns : true iff target is a stow directory
# Throws : n/a
# Comments : none
#============================================================================
sub should_skip_stow_dir_target {
my ($target) = @_;
# don't try to remove anything under a stow directory
if ($target eq $Stow_Path) {
debug(2, "Skipping target which was current stow directory $target");
return 1;
}
for my $f (".stow", ".nonstow") {
if (-e join_paths($target, $f)) {
debug(2, "Skipping $target which contained $f");
return 1;
}
}
debug (4, "$target not protected");
return 0;
}
#===== SUBROUTINE =========================================================== #===== SUBROUTINE ===========================================================
# Name : unstow_contents_orig() # Name : unstow_contents_orig()
# Purpose : unstow the contents of the given directory # Purpose : unstow the contents of the given directory
@ -556,11 +583,8 @@ sub stow_node {
sub unstow_contents_orig { sub unstow_contents_orig {
my ($path, $target) = @_; my ($path, $target) = @_;
# don't try to remove anything under a stow directory return if should_skip_stow_dir_target($target);
if ($target eq $Stow_Path or -e "$target/.stow" or -e "$target/.nonstow") {
debug(2, "Not unstowing from protected directory $target (compat mode)");
return;
}
my $cwd = getcwd(); my $cwd = getcwd();
debug(2, "Unstowing from $target (compat mode, cwd is $cwd)"); debug(2, "Unstowing from $target (compat mode, cwd is $cwd)");
debug(3, "--- source path is $path"); debug(3, "--- source path is $path");
@ -663,11 +687,8 @@ sub unstow_node_orig {
sub unstow_contents { sub unstow_contents {
my ($path, $target) = @_; my ($path, $target) = @_;
# don't try to remove anything under a stow directory return if should_skip_stow_dir_target($target);
if ($target eq $Stow_Path or -e "$target/.stow") {
debug(2, "Not unstowing from protected directory $target");
return;
}
my $cwd = getcwd(); my $cwd = getcwd();
debug(2, "Unstowing from $target (cwd is $cwd)"); debug(2, "Unstowing from $target (cwd is $cwd)");
debug(3, "--- source path is $path"); debug(3, "--- source path is $path");