finalize: fix some dropped error issues

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/install/action/finalize.js b/lib/install/action/finalize.js
index f8e2c884f..1e8647571 100644
--- a/lib/install/action/finalize.js
+++ b/lib/install/action/finalize.js
@@ -34,9 +34,11 @@ module.exports = function (staging, pkg, log) {
       .then(restoreOldNodeModules)
       .catch((err) => {
         if (movedDestAway) {
-          return rimraf(pkg.realpath).then(moveOldDestinationBack).thenReturn(Promise.reject(err))
+          return rimraf(pkg.realpath).then(moveOldDestinationBack).then(() => {
+            throw err
+          })
         } else {
-          return Promise.reject(err)
+          throw err
         }
       })
       .then(() => rimraf(delpath))
@@ -53,7 +55,9 @@ module.exports = function (staging, pkg, log) {
   }
 
   function destinationIsClear () {
-    return lstat(pkg.realpath).then(() => Bluebird.reject(new Error('destination exists')), () => Bluebird.resolve())
+    return lstat(pkg.realpath).then(() => {
+      throw new Error('destination exists')
+    }, () => {})
   }
 
   function actuallyMoveStaging () {
@@ -61,7 +65,9 @@ module.exports = function (staging, pkg, log) {
   }
 
   function moveOldDestinationAway () {
-    return rimraf(delpath).then(() => move(pkg.realpath, delpath, moveOpts)).then(() => { movedDestAway = true })
+    return rimraf(delpath).then(() => {
+      return move(pkg.realpath, delpath, moveOpts)
+    }).then(() => { movedDestAway = true })
   }
 
   function moveOldDestinationBack () {