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

find_containing_marked_stow_dir: 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:07:09 +01:00
parent 75c892abc6
commit 170d161692
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

@ -1067,13 +1067,13 @@ sub link_dest_within_stow_dir {
return ($package, $path); return ($package, $path);
} }
=head2 find_containing_marked_stow_dir($path) =head2 find_containing_marked_stow_dir($pkg_path_from_cwd)
Detect whether path is within a marked stow directory Detect whether path is within a marked stow directory
=over 4 =over 4
=item $path => path to directory to check =item $pkg_path_from_cwd => path to directory to check
=back =back
@ -1090,15 +1090,15 @@ C<marked_stow_dir()> won't work.
sub find_containing_marked_stow_dir { sub find_containing_marked_stow_dir {
my $self = shift; my $self = shift;
my ($path) = @_; my ($pkg_path_from_cwd) = @_;
# Search for .stow files - this allows us to detect links # Search for .stow files - this allows us to detect links
# owned by stow directories other than the current one. # owned by stow directories other than the current one.
my @segments = File::Spec->splitdir($path); my @segments = File::Spec->splitdir($pkg_path_from_cwd);
for my $last_segment (0 .. $#segments) { for my $last_segment (0 .. $#segments) {
my $path = join_paths(@segments[0 .. $last_segment]); my $pkg_path_from_cwd = join_paths(@segments[0 .. $last_segment]);
debug(5, 5, "is $path marked stow dir?"); debug(5, 5, "is $pkg_path_from_cwd marked stow dir?");
if ($self->marked_stow_dir($path)) { if ($self->marked_stow_dir($pkg_path_from_cwd)) {
if ($last_segment == $#segments) { if ($last_segment == $#segments) {
# This should probably never happen. Even if it did, # This should probably never happen. Even if it did,
# there would be no way of calculating $package. # there would be no way of calculating $package.
@ -1106,7 +1106,7 @@ sub find_containing_marked_stow_dir {
} }
my $package = $segments[$last_segment + 1]; my $package = $segments[$last_segment + 1];
return ($path, $package); return ($pkg_path_from_cwd, $package);
} }
} }
return ('', ''); return ('', '');