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

stow_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:57:36 +01:00
parent 3c904dade2
commit c45a0632a9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Stow.pm.in
View file

@ -520,9 +520,9 @@ sub stow_node {
debug(4, 1, "Evaluate existing link: $target_subpath => $existing_link_dest"); debug(4, 1, "Evaluate existing link: $target_subpath => $existing_link_dest");
# 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, $existing_link_dest); $self->find_stowed_path($target_subpath, $existing_link_dest);
if (not $existing_path) { if (not $existing_pkg_path_from_cwd) {
$self->conflict( $self->conflict(
'stow', 'stow',
$package, $package,
@ -532,7 +532,7 @@ sub stow_node {
} }
# Does the existing $target_subpath actually point to anything? # Does the existing $target_subpath actually point to anything?
if ($self->is_a_node($existing_path)) { if ($self->is_a_node($existing_pkg_path_from_cwd)) {
if ($existing_link_dest eq $source) { if ($existing_link_dest eq $source) {
debug(2, 0, "--- Skipping $target_subpath as it already points to $source"); debug(2, 0, "--- Skipping $target_subpath as it already points to $source");
} }