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

unstow_* helpers: rename $path to $pkg_path_from_cwd

Browse source 
$path is horribly vague, so rename to be more informative.
This commit is contained in:
Adam Spiers 2024-04-01 16:06:12 +01:00
parent c0060443ee
commit 75c892abc6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Stow.pm.in
View file

@ -826,7 +826,7 @@ sub unstow_node {
sub unstow_link_node { sub unstow_link_node {
my $self = shift; my $self = shift;
my ($package, $target_subpath, $path) = @_; my ($package, $target_subpath, $pkg_path_from_cwd) = @_;
debug(4, 2, "Evaluate existing link: $target_subpath"); debug(4, 2, "Evaluate existing link: $target_subpath");
# Where is the link pointing? # Where is the link pointing?
@ -862,17 +862,17 @@ 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_path) {
$self->unstow_valid_link($path, $target_subpath, $existing_path); $self->unstow_valid_link($pkg_path_from_cwd, $target_subpath, $existing_path);
} }
else { else {
debug(2, 0, "--- removing invalid link into a stow directory: $path"); debug(2, 0, "--- removing invalid link into a stow directory: $pkg_path_from_cwd");
$self->do_unlink($target_subpath); $self->do_unlink($target_subpath);
} }
} }
sub unstow_valid_link { sub unstow_valid_link {
my $self = shift; my $self = shift;
my ($path, $target_subpath, $existing_path) = @_; my ($pkg_path_from_cwd, $target_subpath, $existing_path) = @_;
# Does link points to the right place? # Does link points to the right place?
# Adjust for dotfile if necessary. # Adjust for dotfile if necessary.
@ -880,7 +880,7 @@ sub unstow_valid_link {
$existing_path = adjust_dotfile($existing_path); $existing_path = adjust_dotfile($existing_path);
} }
if ($existing_path eq $path) { if ($existing_path eq $pkg_path_from_cwd) {
$self->do_unlink($target_subpath); $self->do_unlink($target_subpath);
} }
@ -952,7 +952,7 @@ sub link_owned_by_package {
my $self = shift; my $self = shift;
my ($target_subpath, $source) = @_; my ($target_subpath, $source) = @_;
my ($path, $stow_path, $package) = my ($pkg_path_from_cwd, $stow_path, $package) =
$self->find_stowed_path($target_subpath, $source); $self->find_stowed_path($target_subpath, $source);
return $package; return $package;
} }