Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-05-22 11:06:27 +02:00
parent f531cdac6c 17da88a12f
commit 67d1467b31
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/client/modules/org/arangodb/foxx/manager.js
View File

@ -284,7 +284,7 @@
[ appInfo, mount ] ); [ appInfo, mount ] );
utils.validateMount(mount); utils.validateMount(mount);
if (utils.pathRegex.test(appInfo) || fs.exists(appInfo)) { if (fs.exists(appInfo)) {
appInfo = moveAppToServer(appInfo); appInfo = moveAppToServer(appInfo);
} }
var res; var res;
@ -343,7 +343,7 @@
[ appInfo, mount ] ); [ appInfo, mount ] );
utils.validateMount(mount); utils.validateMount(mount);
if (utils.pathRegex.test(appInfo) || fs.exists(appInfo)) { if (exists(appInfo)) {
appInfo = moveAppToServer(appInfo); appInfo = moveAppToServer(appInfo);
} }
var res; var res;
@ -375,7 +375,7 @@
[ "Mount path", "string" ] ], [ "Mount path", "string" ] ],
[ appInfo, mount ] ); [ appInfo, mount ] );
utils.validateMount(mount); utils.validateMount(mount);
if (utils.pathRegex.test(appInfo) || fs.exists(appInfo)) { if (fs.exists(appInfo)) {
appInfo = moveAppToServer(appInfo); appInfo = moveAppToServer(appInfo);
} }
var res; var res;