[Saga-devel] saga SVN commit 3301: /trunk/adaptors/ssh/ssh_context/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/15 10:37 AM

Modified:
 /trunk/adaptors/ssh/ssh_context/
  ssh_context_adaptor.cpp

Log:
 fixes

File Changes:

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

File [modified]: ssh_context_adaptor.cpp
Delta lines: +18 -7
===================================================================
--- trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.cpp	2009-01-15 16:18:43 UTC (rev 3300)
+++ trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.cpp	2009-01-15 16:37:49 UTC (rev 3301)
@@ -168,17 +168,23 @@
       return ci;
     }
 
-    saga::filesystem::directory d (std::string ("file://localhost/") + home);
+    std::cout << " === home: " << home << "\n";
 
+    saga::filesystem::directory d (std::string ("file://localhost/") + home + "/");
+
+    std::cout << " === 0 " << d.get_url () << "\n";
+
     if ( d.exists (".ssh") &&
          d.is_dir (".ssh") )
     {
+      std::cout << " === 1 " << d.get_url () << "\n";
       d.change_dir (".ssh");
     }
     else
     if ( d.exists (".ssh2") &&
          d.is_dir (".ssh2") )
     {
+      std::cout << " === 2 " << d.get_url () << "\n";
       d.change_dir (".ssh2");
     }
     else
@@ -188,16 +194,20 @@
       return ci;
     }
 
-    if ( d.exists  ("id.dsa") &&
-         d.is_file ("id.dsa") )
+    std::cout << " === 3 " << d.get_url () << "\n";
+
+    if ( d.exists  ("id_dsa") &&
+         d.is_file ("id_dsa") )
     {
-      path = d.get_cwd ().get_path () + "/id.dsa"; 
+      path = d.get_url ().get_path () + "/id_dsa"; 
+      std::cout << " === 4 " << path << "\n";
     }
     else
-    if ( d.exists  ("id.rsa") &&
-         d.is_file ("id.rsa") )
+    if ( d.exists  ("id_rsa") &&
+         d.is_file ("id_rsa") )
     {
-      path = d.get_cwd ().get_path () + "/id.rsa"; 
+      path = d.get_url ().get_path () + "/id_rsa"; 
+      std::cout << " === 5 " << path << "\n";
     }
     else
     {
@@ -205,6 +215,7 @@
       ci.success      = false;
       return ci;
     }
+    std::cout << " === 6 " << path << "\n";
   }