publish -f: Fail with the first error if unpublish failed

Otherwise, you get cryptic 'cannot publish over existing version'
stuff, when actually, you're not allowed to publish at all.

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/publish.js b/lib/publish.js
index 62d7fb9bb..00ffdfae3 100644
--- a/lib/publish.js
+++ b/lib/publish.js
@@ -98,9 +98,12 @@ function publish_ (arg, data, isRetry, cachedir, cb) {
       log.warn("publish", "Forced publish over "+data._id)
       return npm.commands.unpublish([data._id], function (er) {
         // ignore errors.  Use the force.  Reach out with your feelings.
-        publish([arg], true, cb)
+        // but if it fails again, then report the first error.
+        publish([arg], er || true, cb)
       })
     }
+    // report the unpublish error if this was a retry and unpublish failed
+    if (er && isRetry && isRetry !== true) return cb(isRetry)
     if (er) return cb(er)
     console.log("+ " + data._id)
     cb()