Bug 833659 - REINSTALL_FORBIDDEN error isn't triggering when installing a packaged app with a mini-manifest off of X origin when a hosted app was already installed from X origin r=ferjm

dom/apps/src/Webapps.jsm

@@ -1635,7 +1635,8 @@ this.DOMApplicationRegistry = {
     // Disallow reinstalls from the same manifest URL for now.
     // See https://bugzilla.mozilla.org/show_bug.cgi?id=821288
     if (this.getAppLocalIdByManifestURL(app.manifestURL) !==
-        Ci.nsIScriptSecurityManager.NO_APP_ID) {
+        Ci.nsIScriptSecurityManager.NO_APP_ID ||
+        this._appId(app.origin) !== null) {
       sendError("REINSTALL_FORBIDDEN");
       return;
     }