From 697a3d61408f1a4777d029eba0507cee1a93ca22 Mon Sep 17 00:00:00 2001
From: Manuel Franceschini <livewire@google.com>
Date: Fri, 3 Sep 2010 12:47:51 +0200
Subject: [PATCH] Fix some epydoc warnings
Signed-off-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/ssh.py | 4 ++--
tools/setup-ssh | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/ssh.py b/lib/ssh.py
index cb7aa186a..8daf579de 100644
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -34,11 +34,11 @@ from ganeti import constants
def FormatParamikoFingerprint(fingerprint):
- """Formats the fingerprint of L{paramiko.PKey.get_fingerprint()}
+ """Format paramiko PKey fingerprint.
@type fingerprint: str
@param fingerprint: PKey fingerprint
- @return The string hex representation of the fingerprint
+ @return: The string hex representation of the fingerprint
"""
assert len(fingerprint) % 2 == 0
diff --git a/tools/setup-ssh b/tools/setup-ssh
index 2dd2c9ab6..b57d842ed 100755
--- a/tools/setup-ssh
+++ b/tools/setup-ssh
@@ -231,7 +231,7 @@ def SetupLogging(options):
def LoadPrivateKeys(options):
- """Load the list of available private keys
+ """Load the list of available private keys.
It loads the standard ssh key from disk and then tries to connect to
the ssh agent too.
@@ -298,9 +298,9 @@ def LoginViaKeys(transport, username, keys):
def LoadKnownHosts():
- """Loads the known hosts
+ """Load the known hosts.
- @return L{paramiko.util.load_host_keys} dict
+ @return: paramiko.util.load_host_keys dict
"""
homedir = utils.GetHomeDir(constants.GANETI_RUNAS)
--
GitLab