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

Refactor Conflict()

Browse source
This commit is contained in:
Adam Spiers 2011-11-09 23:13:51 +00:00
parent ce93936919
commit d2e9969efb
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stow.in
View file

@ -469,14 +469,14 @@ sub DoMkdir {
sub Conflict {
local($a, $b) = @_;
my $src = &JoinPaths($Stow, $a);
my $dst = &JoinPaths($Target, $b);
if ($Conflicts) {
warn sprintf("CONFLICT: %s vs. %s\n", &JoinPaths($Stow, $a),
&JoinPaths($Target, $b));
warn "CONFLICT: $src vs. $dst\n";
#system "ls -l $src $dst";
} else {
die sprintf("%s: CONFLICT: %s vs. %s\n",
$ProgramName,
&JoinPaths($Stow, $a),
&JoinPaths($Target, $b));
die "$ProgramName: CONFLICT: $src vs. $dst\n";
}
}