*** empty log message ***
This commit is contained in:
parent
3cd2580cfe
commit
921041f2a8
1 changed files with 4 additions and 4 deletions
8
Stow.pm
8
Stow.pm
|
@ -129,11 +129,11 @@ sub JoinPaths {
|
||||||
}
|
}
|
||||||
|
|
||||||
# This removes stow-controlled symlinks from $targetdir for the
|
# This removes stow-controlled symlinks from $targetdir for the
|
||||||
# packages in the %$to_unstow hash, and is called recursively to
|
# packages in the %$PkgsToUnstow hash, and is called recursively to
|
||||||
# process subdirectories.
|
# process subdirectories.
|
||||||
|
|
||||||
sub Unstow {
|
sub Unstow {
|
||||||
my($targetdir, $stow, $to_unstow) = @_;
|
my($targetdir, $stow, $PkgsToUnstow) = @_;
|
||||||
# Note $targetdir is relative to the top of the target hierarchy,
|
# Note $targetdir is relative to the top of the target hierarchy,
|
||||||
# i.e. $opts{target}.
|
# i.e. $opts{target}.
|
||||||
#
|
#
|
||||||
|
@ -193,7 +193,7 @@ sub Unstow {
|
||||||
# collections we are unstowing?
|
# collections we are unstowing?
|
||||||
my @stowmember = split(/\/+/, $stowmember);
|
my @stowmember = split(/\/+/, $stowmember);
|
||||||
my $collection = shift(@stowmember);
|
my $collection = shift(@stowmember);
|
||||||
if ($to_unstow->{$collection}) {
|
if ($PkgsToUnstow->{$collection}) {
|
||||||
# Yep, so get rid of it.
|
# Yep, so get rid of it.
|
||||||
&DoUnlink($contentPath);
|
&DoUnlink($contentPath);
|
||||||
} else {
|
} else {
|
||||||
|
@ -225,7 +225,7 @@ sub Unstow {
|
||||||
my ($subpure, $subother) = &Unstow(
|
my ($subpure, $subother) = &Unstow(
|
||||||
&JoinPaths($targetdir, $content),
|
&JoinPaths($targetdir, $content),
|
||||||
&JoinPaths('..', $stow),
|
&JoinPaths('..', $stow),
|
||||||
$to_unstow,
|
$PkgsToUnstow,
|
||||||
);
|
);
|
||||||
if ($subpure) {
|
if ($subpure) {
|
||||||
push @puresubdirs, "$content/$subother";
|
push @puresubdirs, "$content/$subother";
|
||||||
|
|
Loading…
Reference in a new issue