mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 01:21:03 +01:00
Code Issues Releases Activity

Merge branch 'master' of git@github.com:mongodb/mongo

Browse Source
This commit is contained in:
Dwight 2009-09-22 13:46:38 -04:00
commit 91b32ffc15
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -65,7 +65,7 @@ COMPILING
--- ubuntu ---
scons libboost-dev libpcre++-dev libmozjs-dev
scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev
--- FreeBSD ---

11
shell/dbshell.cpp
View File

@ -432,7 +432,7 @@ int _main(int argc, char* argv[]) {
string cmd = line;
if ( cmd.find( " " ) > 0 )
cmd = cmd.substr( 0 , cmd.find( " " ) );
if ( cmd.find( "\"" ) == string::npos ){
scope->exec( (string)"__iscmd__ = shellHelper[\"" + cmd + "\"];" , "(shellhelp1)" , false , true , true );
if ( scope->getBoolean( "__iscmd__" ) ){
@ -444,8 +444,13 @@ int _main(int argc, char* argv[]) {
}
if ( ! wascmd ){
scope->exec( code.c_str() , "(shell)" , false , true , false );
scope->exec( "shellPrintHelper( __lastres__ );" , "(shell2)" , true , true , false );
try {
scope->exec( code.c_str() , "(shell)" , false , true , false );
scope->exec( "shellPrintHelper( __lastres__ );" , "(shell2)" , true , true , false );
}
catch ( std::exception& e ){
cout << "error:" << e.what() << endl;
}
}