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

rename $existing_source => $existing_link_dest

Browse source 
Source can be ambiguous, as mentioned in the manual.
This commit is contained in:
Adam Spiers 2024-04-01 00:39:18 +01:00
parent e0212d4f49
commit 0871a483cf
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Stow.pm.in
View file

@ -525,15 +525,15 @@ sub stow_node {
# Does the target already exist? # Does the target already exist?
if ($self->is_a_link($target)) { if ($self->is_a_link($target)) {
# Where is the link pointing? # Where is the link pointing?
my $existing_source = $self->read_a_link($target); my $existing_link_dest = $self->read_a_link($target);
if (not $existing_source) { if (not $existing_link_dest) {
error("Could not read link: $target"); 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? # Does it point to a node under any stow directory?
my ($existing_path, $existing_stow_path, $existing_package) = 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) { if (not $existing_path) {
$self->conflict( $self->conflict(
'stow', 'stow',
@ -545,7 +545,7 @@ sub stow_node {
# Does the existing $target actually point to anything? # Does the existing $target actually point to anything?
if ($self->is_a_node($existing_path)) { 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"); debug(2, 0, "--- Skipping $target as it already points to $source");
} }
elsif ($self->defer($target)) { elsif ($self->defer($target)) {
@ -556,7 +556,7 @@ sub stow_node {
$self->do_unlink($target); $self->do_unlink($target);
$self->do_link($source, $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))) $self->is_a_dir(join_paths(parent($target), $source)))
{ {
@ -571,7 +571,7 @@ sub stow_node {
$existing_stow_path, $existing_stow_path,
$existing_package, $existing_package,
$target, $target,
join_paths('..', $existing_source), join_paths('..', $existing_link_dest),
$level + 1, $level + 1,
); );
$self->stow_contents( $self->stow_contents(
@ -587,7 +587,7 @@ sub stow_node {
'stow', 'stow',
$package, $package,
"existing target is stowed to a different package: " "existing target is stowed to a different package: "
. "$target => $existing_source" . "$target => $existing_link_dest"
); );
} }
} }