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

unstow_node_orig: replace a bunch of duplicated code with unstow_link_node()

Browse source
This commit is contained in:
Adam Spiers 2024-04-01 12:12:27 +01:00
parent 517384407b
commit 456424c560
1 changed files with 15 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/Stow.pm.in
View file

@ -782,40 +782,7 @@ sub unstow_node_orig {
# Does the target exist? # Does the target exist?
if ($self->is_a_link($target)) { if ($self->is_a_link($target)) {
debug(4, 1, "Evaluate existing link: $target"); $self->unstow_link_node($package, $target, $path);
# Where is the link pointing?
my $existing_source = $self->read_a_link($target);
if (not $existing_source) {
error("Could not read link: $target");
}
# 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);
if (not $existing_path) {
# We're traversing the target tree not the package tree,
# so we definitely expect to find stuff not owned by stow.
# Therefore we can't flag a conflict.
return; # XXX #
}
# Does the existing $target actually point to anything?
if (-e $existing_path) {
# Does link point to the right place?
if ($existing_path eq $path) {
$self->do_unlink($target);
}
elsif ($self->override($target)) {
debug(2, 0, "--- overriding installation of: $target");
$self->do_unlink($target);
}
# else leave it alone
}
else {
debug(2, 0, "--- removing invalid link into a stow directory: $path");
$self->do_unlink($target);
}
} }
elsif (-d $target) { elsif (-d $target) {
$self->unstow_contents_orig($package, $target); $self->unstow_contents_orig($package, $target);
@ -966,12 +933,20 @@ sub unstow_link_node {
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_source);
if (not $existing_path) { if (not $existing_path) {
if ($self->{compat}) {
# We're traversing the target tree not the package tree,
# so we definitely expect to find stuff not owned by stow.
# Therefore we can't flag a conflict.
return;
}
else {
$self->conflict( $self->conflict(
'unstow', 'unstow',
$package, $package,
"existing target is not owned by stow: $target => $existing_source" "existing target is not owned by stow: $target => $existing_source"
); );
return; # XXX # }
return;
} }
# Does the existing $target actually point to anything? # Does the existing $target actually point to anything?