Author: chatellier Date: 2009-03-02 14:22:38 +0000 (Mon, 02 Mar 2009) New Revision: 1899 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx Log: Fix bug #1623, make ssh parent folder Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-03-02 13:53:14 UTC (rev 1898) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-03-02 14:22:38 UTC (rev 1899) @@ -56,6 +56,10 @@ return; } File publicKeyFile = new File(f.getAbsolutePath() + ".pub"); + // bug #1623, le dossier parent n'existe pas + if (publicKeyFile.getParentFile() != null && publicKeyFile.getParentFile().isDirectory()) { + publicKeyFile.mkdirs(); + } log.info("Generate ssh key to " + f); SshKeyGenerator.main(new String[]{"-b", "1024", "-t", "rsa", f.getAbsolutePath()}); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2009-03-02 13:53:14 UTC (rev 1898) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2009-03-02 14:22:38 UTC (rev 1899) @@ -55,7 +55,12 @@ sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); } // convert to openSSH ? + if (serverPublicKeyFile. File publicKeyFile = new File(serverPublicKeyFile.getText()); + // bug #1623, le dossier parent n'existe pas + if (publicKeyFile.getParentFile() != null && publicKeyFile.getParentFile().isDirectory()) { + publicKeyFile.mkdirs(); + } log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); log.info("public key OpenSsh : "+openSshPublicKey);