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

CONFLICTs need to stay on one line for Cfg::Utils::preempt_conflict()

Browse source
This commit is contained in:
adam 2011-10-24 16:09:25 +00:00 committed by Adam Spiers
parent 9fd7eab0d1
commit 08df492348
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Stow.pm
View file

@ -525,7 +525,7 @@ sub Conflict {
my $src = &AbbrevHome(&JoinPaths($opts{stow}, $a)); my $src = &AbbrevHome(&JoinPaths($opts{stow}, $a));
my $dst = &AbbrevHome(&JoinPaths($opts{target}, $b)); my $dst = &AbbrevHome(&JoinPaths($opts{target}, $b));
my $msg = "CONFLICT:\n $src\nvs.\n $dst" . ($type ? "\n ($type)" : '') . "\n\n"; my $msg = "CONFLICT: $src vs. $dst" . ($type ? " ($type)" : '') . "\n";
if ($opts{conflicts}) { if ($opts{conflicts}) {
warn $msg; warn $msg;
#system "ls -l $src $dst"; #system "ls -l $src $dst";