From 08e1c902ec0c5eec66aea11d792b6f2624b2c61f Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Mon, 1 Apr 2024 21:55:51 +0100 Subject: [PATCH] unstow_link_node: rename $existing_path Unqualified references to "path" are horribly vague, so rename to $existing_pkg_path_from_cwd for clarity. --- lib/Stow.pm.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in index 67fd2b1..b7d590c 100755 --- a/lib/Stow.pm.in +++ b/lib/Stow.pm.in @@ -839,9 +839,9 @@ sub unstow_link_node { } # 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); - if (not $existing_path) { + if (not $existing_pkg_path_from_cwd) { if ($self->{compat}) { # We're traversing the target tree not the package tree, # 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? - if (-e $existing_path) { - $self->unstow_valid_link($pkg_path_from_cwd, $target_subpath, $existing_path); + if (-e $existing_pkg_path_from_cwd) { + $self->unstow_valid_link($pkg_path_from_cwd, $target_subpath, $existing_pkg_path_from_cwd); } else { debug(2, 0, "--- removing invalid link into a stow directory: $pkg_path_from_cwd");