From 1e4f0a1e659302c383d63d6e8560eebdebc8bc99 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 2 Mar 2017 17:29:06 +0100 Subject: [PATCH 1/2] fix the output where the user can locate the logfiles - they're in ~ --- Installation/MacOSX/Bundle/arangodb-cli.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh.in b/Installation/MacOSX/Bundle/arangodb-cli.sh.in index 59d2b3b921..6c63a6e030 100755 --- a/Installation/MacOSX/Bundle/arangodb-cli.sh.in +++ b/Installation/MacOSX/Bundle/arangodb-cli.sh.in @@ -56,10 +56,10 @@ INFOFILE="/tmp/ArangoDB-CLI.info.$$" echo "ArangoDB server has been started" echo "" echo "The database directory is located at" - echo " '${ROOTDIR}@INC_CPACK_ARANGO_DATA_DIR@'" + echo " '${HOME}@INC_CPACK_ARANGO_DATA_DIR@'" echo "" echo "The log file is located at" - echo " '${ROOTDIR}@INC_CPACK_ARANGO_LOG_DIR@/arangod.log'" + echo " '${HOME}@INC_CPACK_ARANGO_LOG_DIR@/arangod.log'" echo "" echo "You can access the server using a browser at 'http://127.0.0.1:8529/'" echo "or start the ArangoDB shell" From e6d5058557bb5baf2b05b2aab2906cf10b26104a Mon Sep 17 00:00:00 2001 From: jsteemann Date: Thu, 2 Mar 2017 17:53:33 +0100 Subject: [PATCH 2/2] fix error message --- arangod/RestHandler/RestImportHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/RestHandler/RestImportHandler.cpp b/arangod/RestHandler/RestImportHandler.cpp index 0127283809..a7fc808a6c 100644 --- a/arangod/RestHandler/RestImportHandler.cpp +++ b/arangod/RestHandler/RestImportHandler.cpp @@ -1079,7 +1079,7 @@ std::shared_ptr RestImportHandler::createVelocyPackObject( if (itKeys.size() != itValues.size()) { errorMsg = positionize(lineNumber) + "wrong number of JSON values (got " + - std::to_string(itKeys.size()) + ", expected " + std::to_string(itValues.size()) + ")"; + std::to_string(itValues.size()) + ", expected " + std::to_string(itKeys.size()) + ")"; THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER, errorMsg); }