[Saga-devel] saga SVN commit 3378: /trunk/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/24 10:57 AM

Modified:
 /trunk/adaptors/aws/aws_context/
  aws_context_adaptor.cpp
 /trunk/adaptors/aws/internal/bin/
  saga-image-prep-ec2
 /trunk/saga/saga/adaptors/utils/process/
  process.cpp

Log:
 scattered changes
 A

File Changes:

Directory: /trunk/adaptors/aws/aws_context/
===========================================

File [modified]: aws_context_adaptor.cpp
Delta lines: +1 -1
===================================================================
--- trunk/adaptors/aws/aws_context/aws_context_adaptor.cpp	2009-01-24 16:40:41 UTC (rev 3377)
+++ trunk/adaptors/aws/aws_context/aws_context_adaptor.cpp	2009-01-24 16:57:14 UTC (rev 3378)
@@ -302,7 +302,7 @@
          ! adap_ini.has_entry ("java_home"   ) ||
          ! adap_ini.has_entry ("ec2_home"    ) )
     {
-      SAGA_ADAPTOR_THROW_NO_CONTEXT ("Adaptor needs the 'cloud_names' key.",
+      SAGA_ADAPTOR_THROW_NO_CONTEXT ("incomplete ini section for ec2.",
                                      saga::NoSuccess);
     }
 

Directory: /trunk/adaptors/aws/internal/bin/
============================================

File [modified]: saga-image-prep-ec2
Delta lines: +2 -0
===================================================================
--- trunk/adaptors/aws/internal/bin/saga-image-prep-ec2	2009-01-24 16:40:41 UTC (rev 3377)
+++ trunk/adaptors/aws/internal/bin/saga-image-prep-ec2	2009-01-24 16:57:14 UTC (rev 3378)
@@ -14,3 +14,5 @@
 
 echo "image prep done"
 
+exit 0
+

Directory: /trunk/saga/saga/adaptors/utils/process/
===================================================

File [modified]: process.cpp
Delta lines: +1 -1
===================================================================
--- trunk/saga/saga/adaptors/utils/process/process.cpp	2009-01-24 16:40:41 UTC (rev 3377)
+++ trunk/saga/saga/adaptors/utils/process/process.cpp	2009-01-24 16:57:14 UTC (rev 3378)
@@ -199,7 +199,7 @@
             for ( std::string line; err.good () && getline (err, line); err_v_.push_back   (line) );
           }
 
-          boost::process::status status = c_.wait();
+          boost::process::status status = c_.wait ();
 
           if ( ! status.exited () || status.exit_status () )
           {