Refactor Conflict()
This commit is contained in:
parent
ce93936919
commit
d2e9969efb
1 changed files with 6 additions and 6 deletions
12
stow.in
12
stow.in
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue