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

issue #1300: do not make arangodump fail if output directory exists but is empty

This commit is contained in:
Jan Steemann 2015-04-13 11:45:16 +02:00
parent d7dc9ea169
commit e507e4f9d9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arangosh/V8Client/arangodump.cpp
View File

@ -1287,8 +1287,17 @@ int main (int argc, char* argv[]) {
// ............................................................................. // .............................................................................
bool isDirectory = false; bool isDirectory = false;
bool isEmptyDirectory = false;
if (! OutputDirectory.empty()) { if (! OutputDirectory.empty()) {
isDirectory = TRI_IsDirectory(OutputDirectory.c_str()); isDirectory = TRI_IsDirectory(OutputDirectory.c_str());
if (isDirectory) {
TRI_vector_string_t files = TRI_FullTreeDirectory(OutputDirectory.c_str());
// we don't care if the target directory is empty
isEmptyDirectory = (files._length == 0);
TRI_DestroyVectorString(&files);
}
} }
if (OutputDirectory.empty() || if (OutputDirectory.empty() ||
@ -1297,7 +1306,7 @@ int main (int argc, char* argv[]) {
TRI_EXIT_FUNCTION(EXIT_FAILURE, nullptr); TRI_EXIT_FUNCTION(EXIT_FAILURE, nullptr);
} }
if (isDirectory && ! Overwrite) { if (isDirectory && ! isEmptyDirectory && ! Overwrite) {
cerr << "output directory '" << OutputDirectory << "' already exists. use \"--overwrite true\" to overwrite data in it" << endl; cerr << "output directory '" << OutputDirectory << "' already exists. use \"--overwrite true\" to overwrite data in it" << endl;
TRI_EXIT_FUNCTION(EXIT_FAILURE, nullptr); TRI_EXIT_FUNCTION(EXIT_FAILURE, nullptr);
} }
@ -1453,9 +1462,7 @@ int main (int argc, char* argv[]) {
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
if (Client != nullptr) { delete Client;
delete Client;
}
TRIAGENS_REST_SHUTDOWN; TRIAGENS_REST_SHUTDOWN;