Merge from vscode de81ccf04849309f843db21130c806a5783678f7 (#4738)

This commit is contained in:
Anthony Dresser
2019-03-28 13:06:16 -07:00
committed by GitHub
parent cc2951265e
commit e6785ffe95
77 changed files with 562 additions and 835 deletions

View File

@@ -205,10 +205,6 @@ export function del(path: string, tmpFolder: string, callback: (error: Error | n
// do the heavy deletion outside the callers callback
rmRecursive(pathInTemp, error => {
if (error) {
console.error(error);
}
if (done) {
done(error);
}
@@ -308,12 +304,12 @@ export function mv(source: string, target: string, callback: (error: Error | nul
return callback(err);
}
fs.stat(target, (error, stat) => {
fs.lstat(target, (error, stat) => {
if (error) {
return callback(error);
}
if (stat.isDirectory()) {
if (stat.isDirectory() || stat.isSymbolicLink()) {
return callback(null);
}