Revision c4feafe8 lib/ssh.py
b/lib/ssh.py | ||
---|---|---|
52 | 52 |
if not user_dir: |
53 | 53 |
raise errors.OpExecError("Cannot resolve home of user %s" % user) |
54 | 54 |
|
55 |
ssh_dir = os.path.join(user_dir, ".ssh")
|
|
55 |
ssh_dir = utils.PathJoin(user_dir, ".ssh")
|
|
56 | 56 |
if not os.path.lexists(ssh_dir): |
57 | 57 |
if mkdir: |
58 | 58 |
try: |
... | ... | |
63 | 63 |
elif not os.path.isdir(ssh_dir): |
64 | 64 |
raise errors.OpExecError("path ~%s/.ssh is not a directory" % user) |
65 | 65 |
|
66 |
return [os.path.join(ssh_dir, base)
|
|
66 |
return [utils.PathJoin(ssh_dir, base)
|
|
67 | 67 |
for base in ["id_dsa", "id_dsa.pub", "authorized_keys"]] |
68 | 68 |
|
69 | 69 |
|
Also available in: Unified diff