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

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/25 04:11 AM

Modified:
 /trunk/adaptors/aws/aws_job/
  aws_job_service.cpp
 /trunk/adaptors/ssh/ssh_context/
  ssh_context_adaptor.cpp
 /trunk/adaptors/ssh/ssh_job/
  ssh_job_service.cpp
 /trunk/config/
  saga.config.boost.c.mk.in
 /trunk/saga/impl/engine/
  Makefile, uuid.hpp

Log:
 uuid make integration + scattered changes
 A

File Changes:

Directory: /trunk/adaptors/aws/aws_job/
=======================================

File [modified]: aws_job_service.cpp
Delta lines: +3 -0
===================================================================
--- trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-25 09:59:45 UTC (rev 3390)
+++ trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-25 10:11:23 UTC (rev 3391)
@@ -96,6 +96,9 @@
 
     aws_job::process proc (env_);
 
+    SAGA_LOG_INFO (" ========== logging aws job service rm");
+    SAGA_LOG_INFO (idata->rm_.get_string ().c_str ());
+
     // is a VM given which we should contact, or do we need to start a new one?
     bool instance_started = false;
     if ( idata->rm_.get_host () == "" )

Directory: /trunk/config/
=========================

File [modified]: saga.config.boost.c.mk.in
Delta lines: +1 -1
===================================================================
--- trunk/config/saga.config.boost.c.mk.in	2009-01-25 09:59:45 UTC (rev 3390)
+++ trunk/config/saga.config.boost.c.mk.in	2009-01-25 10:11:23 UTC (rev 3391)
@@ -26,7 +26,7 @@
 # always add our local boost include paths, before the system boost installation
 ifdef SAGA_ROOT
 
-  BOOST_EXT_DIRS           = futures plugin process spirit
+  BOOST_EXT_DIRS           = futures plugin process spirit uuid
 
   ifneq "x$(SAGA_BOOST_HAVE_ASIO)" "xyes"
     BOOST_EXT_DIRS        += asio

Directory: /trunk/saga/impl/engine/
===================================

File [modified]: Makefile
Delta lines: +1 -1
===================================================================
--- trunk/saga/impl/engine/Makefile	2009-01-25 09:59:45 UTC (rev 3390)
+++ trunk/saga/impl/engine/Makefile	2009-01-25 10:11:23 UTC (rev 3391)
@@ -6,7 +6,7 @@
 
 SAGA_ROOT         = ../../../
 
-SAGA_SUBDIRS      = ini uuid
+SAGA_SUBDIRS      = ini
 
 SAGA_LIB          = saga_engine
 SAGA_HDR          = $(wildcard *.hpp)

File [modified]: uuid.hpp
Delta lines: +1 -0
===================================================================
--- trunk/saga/impl/engine/uuid.hpp	2009-01-25 09:59:45 UTC (rev 3390)
+++ trunk/saga/impl/engine/uuid.hpp	2009-01-25 10:11:23 UTC (rev 3391)
@@ -11,6 +11,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/uuid/uuid.hpp>
+#include <boost/lexical_cast.hpp>
 
 #include <saga/saga/util.hpp>
 #include <saga/saga/exception.hpp>

Directory: /trunk/adaptors/ssh/ssh_context/
===========================================

File [modified]: ssh_context_adaptor.cpp
Delta lines: +3 -5
===================================================================
--- trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.cpp	2009-01-25 09:59:45 UTC (rev 3390)
+++ trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.cpp	2009-01-25 10:11:23 UTC (rev 3391)
@@ -246,15 +246,13 @@
 
 
   // default for public key
-  if ( key_path_pub == "" &&
-       key_path     != "" )
+  if ( key_path_pub   == "" &&
+       ci.private_key != "" )
   {
-    key_path_pub = key_path + ".pub";
+    ci.public_key = ci.private_key + ".pub";
   }
 
-  ci.public_key  = key_path_pub;
 
-
   // default for key_user
   if ( key_user == "" )
   {

Directory: /trunk/adaptors/ssh/ssh_job/
=======================================

File [modified]: ssh_job_service.cpp
Delta lines: +2 -1
===================================================================
--- trunk/adaptors/ssh/ssh_job/ssh_job_service.cpp	2009-01-25 09:59:45 UTC (rev 3390)
+++ trunk/adaptors/ssh/ssh_job/ssh_job_service.cpp	2009-01-25 10:11:23 UTC (rev 3391)
@@ -89,6 +89,7 @@
       if ( contexts[i].attribute_exists ("Type") &&
            contexts[i].get_attribute ("Type") == "ssh" )
       {
+        SAGA_LOG_ALWAYS ("found ssh context");
         ssh_contexts.push_back (contexts[i]);
       }
     }
@@ -100,7 +101,7 @@
                                      saga::NoSuccess);
     }
 
-    SAGA_LOG_DEBUG (rm_.get_string ().c_str ())
+    SAGA_LOG_ALWAYS (rm_.get_string ().c_str ())
 
 
     // We copy over the ssh identity file of the context we used, so that jobs