diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index fae25c2..63b1c61 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -80,8 +80,14 @@ class HostKeys (UserDict.DictMixin): posix, it will usually be stored in C{os.path.expanduser("~/.ssh/known_hosts")}. + If this method is called multiple times, the host keys are merged, + not cleared. So multiple calls to C{load} will just call L{add}, + replacing any existing entries and adding new ones. + @param filename: name of the file to read host keys from @type filename: str + + @raise IOError: if there was an error reading the file """ f = file(filename, 'r') for line in f: