From 6ce1f2892eab8bf7cb4c848fc0849e0968f7d4f7 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Tue, 24 Feb 2015 13:51:41 +0100
Subject: [PATCH] install fix for Foxx apps

---
 .../modules/org/arangodb/foxx/manager.js      | 21 ++++++++++++++++---
 js/server/tests/shell-foxx-manager-spec.js    |  4 ++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/js/server/modules/org/arangodb/foxx/manager.js b/js/server/modules/org/arangodb/foxx/manager.js
index 54c62a8de0..a474dcad62 100644
--- a/js/server/modules/org/arangodb/foxx/manager.js
+++ b/js/server/modules/org/arangodb/foxx/manager.js
@@ -662,10 +662,25 @@
   ////////////////////////////////////////////////////////////////////////////////
 
   var _scanFoxx = function(mount, options, activateDevelopment) {
+    options = options || { };
     var dbname = arangodb.db._name();
     delete appCache[dbname][mount];
     var app = createApp(mount, options, activateDevelopment);
-    utils.getStorage().save(app.toJSON());
+    try {
+      utils.getStorage().save(app.toJSON());
+    }
+    catch (err) {
+      if (! options.replace ||
+          err.errorNum !== errors.ERROR_ARANGO_UNIQUE_CONSTRAINT_VIOLATED.code) {
+        throw err;
+      }
+      var old = utils.getStorage().firstExample({ mount: mount });
+      if (old === null) {
+        throw new Error("Could not find app for mountpoint '" + mount + "'.");
+      }
+      var manifest = app.toJSON().manifest;
+      utils.getStorage().update(old, { manifest: manifest });
+    }
     return app;
   };
 
@@ -732,6 +747,7 @@
     // Ohterwise move will fail.
     fs.removeDirectory(targetPath);
 
+    initCache();
     try {
       if (appInfo === "EMPTY") {
         // Make Empty app
@@ -756,7 +772,6 @@
       }
       throw e;
     }
-    initCache();
     try {
       db._executeTransaction({
         collections: {
@@ -1063,7 +1078,7 @@
     var collection = utils.getStorage();
     var transAction = function() {
       mount = transformPathToMount(folders[i]);
-      _scanFoxx(mount);
+      _scanFoxx(mount, { replace: true });
     };
     for (i = 0; i < l; ++i) {
       db._executeTransaction({
diff --git a/js/server/tests/shell-foxx-manager-spec.js b/js/server/tests/shell-foxx-manager-spec.js
index f085692376..13ee248063 100644
--- a/js/server/tests/shell-foxx-manager-spec.js
+++ b/js/server/tests/shell-foxx-manager-spec.js
@@ -54,7 +54,7 @@ describe("Foxx Manager", function() {
   it("should be able to install all apps from appstore", function() {
     var mount = "/unittest/testApps";
     try { 
-      FoxxManager.uninstall(mount);
+      FoxxManager.uninstall(mount, { force: true });
     } catch(e) {
     }
     var list = FoxxManager.availableJson();
@@ -67,7 +67,7 @@ describe("Foxx Manager", function() {
       } catch(e) {
         expect(e).toBeUndefined("Could not install " + app.name);
         try {
-          FoxxManager.uninstall(mount);
+          FoxxManager.uninstall(mount, { force: true });
         } catch(err) {
         }
       }