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

unstow_link_node: rename $existing_path

Browse source 
Unqualified references to "path" are horribly vague, so rename to
$existing_pkg_path_from_cwd for clarity.
This commit is contained in:
Adam Spiers 2024-04-01 21:55:51 +01:00
parent 4272e7c4bb
commit 08e1c902ec
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Stow.pm.in
View file

@ -839,9 +839,9 @@ sub unstow_link_node {
} }
# Does it point to a node under any stow directory? # Does it point to a node under any stow directory?
my ($existing_path, $existing_stow_path, $existing_package) = my ($existing_pkg_path_from_cwd, $existing_stow_path, $existing_package) =
$self->find_stowed_path($target_subpath, $link_dest); $self->find_stowed_path($target_subpath, $link_dest);
if (not $existing_path) { if (not $existing_pkg_path_from_cwd) {
if ($self->{compat}) { if ($self->{compat}) {
# We're traversing the target tree not the package tree, # We're traversing the target tree not the package tree,
# so we definitely expect to find stuff not owned by stow. # so we definitely expect to find stuff not owned by stow.
@ -859,8 +859,8 @@ sub unstow_link_node {
} }
# Does the existing $target_subpath actually point to anything? # Does the existing $target_subpath actually point to anything?
if (-e $existing_path) { if (-e $existing_pkg_path_from_cwd) {
$self->unstow_valid_link($pkg_path_from_cwd, $target_subpath, $existing_path); $self->unstow_valid_link($pkg_path_from_cwd, $target_subpath, $existing_pkg_path_from_cwd);
} }
else { else {
debug(2, 0, "--- removing invalid link into a stow directory: $pkg_path_from_cwd"); debug(2, 0, "--- removing invalid link into a stow directory: $pkg_path_from_cwd");