summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2010-06-07 17:28:32 -0400
committerEliot Horowitz <eliot@10gen.com>2010-06-07 17:28:32 -0400
commit944ab0744918d50f1aef30c44a0f9db6f5fa75c6 (patch)
tree1bef9fa66d1b094bd66e419a48578104685cee92 /scripting
parent80a8ec1b4f32f6d524ae81039e072333b4243c90 (diff)
parent9f22a44e0583cb9f50ef039cceb6d90782a3155b (diff)
downloadmongo-944ab0744918d50f1aef30c44a0f9db6f5fa75c6.tar.gz
Merge branch 'master' of github.com:mongodb/mongo
Diffstat (limited to 'scripting')
-rw-r--r--scripting/engine_spidermonkey.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp
index cfbe938dede..46c8a8999b2 100644
--- a/scripting/engine_spidermonkey.cpp
+++ b/scripting/engine_spidermonkey.cpp
@@ -1510,10 +1510,10 @@ namespace mongo {
for ( uintN i=0; i<argc; i++ ){
string filename = c.toString( argv[i] );
- cout << "should load [" << filename << "]" << endl;
+ cout << "load [" << filename << "]" << endl;
if ( ! s->execFile( filename , false , true , false ) ){
- JS_ReportError( cx , ((string)"error loading file: " + filename ).c_str() );
+ JS_ReportError( cx , ((string)"error loading js file: " + filename ).c_str() );
return JS_FALSE;
}
}