From c825c2bbfd13b1ba8de1e2132bee453179443a76 Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 4 Nov 2009 19:25:14 +0000 Subject: [PATCH] Check if jna-posix used a fallback java impl which does not support many operations. If so, don't use posix in Util.createSymlink. When posix IS used but fails, include errno in log. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23470 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Util.java | 9 +++++---- core/src/main/java/hudson/os/PosixAPI.java | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index 4484577400..2e740d4d13 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -964,15 +964,16 @@ public class Util { new LocalProc(new String[]{"rm","-rf", symlinkPath},new String[0],listener.getLogger(), baseDir).join(); int r; - - if (!SYMLINK_ESCAPEHATCH) + String errMsg = ""; + if (!SYMLINK_ESCAPEHATCH && PosixAPI.isNative()) { r = PosixAPI.get().symlink(targetPath,symlinkFile.getAbsolutePath()); - else // escape hatch, until we know that the above works well. + if (r!=0) errMsg = " errno=" + PosixAPI.get().errno(); + } else // escape hatch, until we know that the above works well. r = new LocalProc(new String[]{ "ln","-s", targetPath, symlinkPath}, new String[0],listener.getLogger(), baseDir).join(); if(r!=0) - listener.getLogger().println("ln failed: "+r); + listener.getLogger().println("ln failed: "+r+errMsg); } catch (IOException e) { PrintStream log = listener.getLogger(); log.println("ln failed"); diff --git a/core/src/main/java/hudson/os/PosixAPI.java b/core/src/main/java/hudson/os/PosixAPI.java index c105b68867..c79bed2bed 100644 --- a/core/src/main/java/hudson/os/PosixAPI.java +++ b/core/src/main/java/hudson/os/PosixAPI.java @@ -1,5 +1,6 @@ package hudson.os; +import org.jruby.ext.posix.JavaPOSIX; import org.jruby.ext.posix.POSIX; import org.jruby.ext.posix.POSIXFactory; import org.jruby.ext.posix.POSIXHandler; @@ -20,6 +21,14 @@ public class PosixAPI { return posix; } + /** + * Determine if the jna-posix library could not provide native support, and + * used a fallback java implementation which does not support many operations. + */ + public boolean isNative() { + return !(posix instanceof JavaPOSIX); + } + private static final POSIX posix = POSIXFactory.getPOSIX(new POSIXHandler() { public void error(ERRORS errors, String s) { throw new RuntimeException(s+" "+errors);