From 0871a483cf3687dc71f25da54ef76f2b2aa58e2a Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Mon, 1 Apr 2024 00:39:18 +0100 Subject: [PATCH] rename $existing_source => $existing_link_dest Source can be ambiguous, as mentioned in the manual. --- lib/Stow.pm.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in index 3163621..a2390d0 100755 --- a/lib/Stow.pm.in +++ b/lib/Stow.pm.in @@ -525,15 +525,15 @@ sub stow_node { # Does the target already exist? if ($self->is_a_link($target)) { # Where is the link pointing? - my $existing_source = $self->read_a_link($target); - if (not $existing_source) { + my $existing_link_dest = $self->read_a_link($target); + if (not $existing_link_dest) { error("Could not read link: $target"); } - debug(4, 1, "Evaluate existing link: $target => $existing_source"); + debug(4, 1, "Evaluate existing link: $target => $existing_link_dest"); # Does it point to a node under any stow directory? my ($existing_path, $existing_stow_path, $existing_package) = - $self->find_stowed_path($target, $existing_source); + $self->find_stowed_path($target, $existing_link_dest); if (not $existing_path) { $self->conflict( 'stow', @@ -545,7 +545,7 @@ sub stow_node { # Does the existing $target actually point to anything? if ($self->is_a_node($existing_path)) { - if ($existing_source eq $source) { + if ($existing_link_dest eq $source) { debug(2, 0, "--- Skipping $target as it already points to $source"); } elsif ($self->defer($target)) { @@ -556,7 +556,7 @@ sub stow_node { $self->do_unlink($target); $self->do_link($source, $target); } - elsif ($self->is_a_dir(join_paths(parent($target), $existing_source)) && + elsif ($self->is_a_dir(join_paths(parent($target), $existing_link_dest)) && $self->is_a_dir(join_paths(parent($target), $source))) { @@ -571,7 +571,7 @@ sub stow_node { $existing_stow_path, $existing_package, $target, - join_paths('..', $existing_source), + join_paths('..', $existing_link_dest), $level + 1, ); $self->stow_contents( @@ -587,7 +587,7 @@ sub stow_node { 'stow', $package, "existing target is stowed to a different package: " - . "$target => $existing_source" + . "$target => $existing_link_dest" ); } }