SF.net SVN: safekeep: [463] safekeep/trunk/safekeep

[<di...@us...>]

Revision: 463
          http://safekeep.svn.sourceforge.net/safekeep/?rev=463&view=rev
Author:   dimi
Date:     2007-03-12 22:52:48 -0700 (Mon, 12 Mar 2007)

Log Message:
-----------
Make sure the paths to the SSH keys are absolute

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-03-13 05:25:19 UTC (rev 462)
+++ safekeep/trunk/safekeep	2007-03-13 05:52:48 UTC (rev 463)
@@ -192,9 +192,13 @@
     if host and not user:
         user = 'root'
     if host and not key_ctrl:
-        key_ctrl = os.path.join(home_dir, '.ssh', 'safekeep-server-ctrl-key')
+        key_ctrl = os.path.join('.ssh', 'safekeep-server-ctrl-key')
     if host and not key_data:
-        key_data = os.path.join(home_dir, '.ssh', 'safekeep-server-data-key')
+        key_data = os.path.join('.ssh', 'safekeep-server-data-key')
+    if not os.path.isabs(key_ctrl):
+        key_ctrl = os.path.join(home_dir, key_ctrl)
+    if not os.path.isabs(key_data):
+        key_data = os.path.join(home_dir, key_data)
 
     repo_el = backup_el.getElementsByTagName('repo')
     dir = None


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.