Merge branch 'devel-2.1'

* devel-2.1:
  Fix path in ganeti-rapi man page
  Adjust message in case ~/.ssh is no directory

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

lib/ssh.py

@@ -56,7 +56,7 @@ def GetUserFiles(user, mkdir=False):
   if mkdir:
     utils.EnsureDirs([(ssh_dir, constants.SECURE_DIR_MODE)])
   elif not os.path.isdir(ssh_dir):
-    raise errors.OpExecError("path ~%s/.ssh is not a directory" % user)
+    raise errors.OpExecError("Path %s is not a directory" % ssh_dir)
 
   return [utils.PathJoin(ssh_dir, base)
           for base in ["id_dsa", "id_dsa.pub", "authorized_keys"]]

man/ganeti-rapi.sgml

@@ -94,7 +94,7 @@
     <para>
       The users and their rights are defined in a file named
       <filename>rapi_users</filename>, located in the <filename
-      class="directory">@LOCALSTATEDIR@/ganeti</filename>
+      class="directory">@LOCALSTATEDIR@/lib/ganeti</filename>
       directory. The users should be listed one per line, in the
       following format:
     </para>