[Saga-devel] saga SVN commit 3350: /trunk/adaptors/aws/aws_job/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/22 09:42 AM

Modified:
 /trunk/adaptors/aws/aws_job/
  aws_job_service.cpp

Log:
 don't copy saga.ini.  If SAGA is installed, it should
 already be configured, too.
 A

File Changes:

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

File [modified]: aws_job_service.cpp
Delta lines: +0 -36
===================================================================
--- trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-22 09:24:23 UTC (rev 3349)
+++ trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-22 15:41:57 UTC (rev 3350)
@@ -400,42 +400,6 @@
     usercert_  = ctx_.get_attribute (saga::attributes::context_usercert);
 
 
-    // we also propagate our HOME/.saga.ini file.  This is kind of a hack
-    // (FIXME), but allows us to have a uniform SAGA configuration for all VMs.
-    // FIXME: that should be better done with the prep scripts above.
-
-    SAGA_LOG_ALWAYS ("copying ~/.saga.ini");
-
-    proc.set_cmd ("/usr/bin/scp");
-    proc.clear_args ();
-
-    proc.add_args ("-o", "StrictHostKeyChecking=no");
-    proc.add_args ("-i", userkey_);
-
-    char * home = ::getenv ("HOME");
-
-    if ( home != NULL )
-    {
-      std::string home_s (home);
-      proc.add_arg (home_s + "/.saga.ini");
-    }
-    else
-    {
-      proc.add_arg (".saga.ini");
-    }
-
-    // FIXME: the target below SHOULD not exist *aehem*
-    proc.add_arg (user_ + "@" + vm_ip_ + ":.saga.ini");
-
-    (void) proc.run_sync ();
-
-    if ( proc.fail () )
-    {
-      SAGA_LOG_ALWAYS ("could not copy saga.ini");
-      throw;
-    }
-
-
     // we are sure ssh is running - we should be able to create a ssh job
     // service for the instance now
     ssh_url_ = std::string ("ssh://") + vm_ip_;