Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Ant Developers List" <dev@ant.apache.org>
From: bodewig <git@git.apache.org>
To: dev@ant.apache.org
Reply-To: dev@ant.apache.org
References: <git-pr-49-ant@git.apache.org>
In-Reply-To: <git-pr-49-ant@git.apache.org>
Subject: [GitHub] ant pull request #49: [master branch] - Fix BZ-58683 
Content-Type: text/plain
Message-Id: <20171209180223.0C9A0E38BA@git1-us-west.apache.org>
Date: Sat,  9 Dec 2017 18:02:22 +0000 (UTC)
archived-at: Sat, 09 Dec 2017 18:02:26 -0000

Github user bodewig commented on a diff in the pull request:

    https://github.com/apache/ant/pull/49#discussion_r155928313
  
    --- Diff: src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java ---
    @@ -500,18 +502,12 @@ private void doLink(String res, String lnk) throws BuildException {
                 File dir = fs.getDir(getProject());
     
                 Stream.of(ds.getIncludedFiles(), ds.getIncludedDirectories())
    -                .flatMap(Stream::of).forEach(path -> {
    -                    try {
    -                        File f = new File(dir, path);
    -                        File pf = f.getParentFile();
    -                        String name = f.getName();
    -                        if (SYMLINK_UTILS.isSymbolicLink(pf, name)) {
    -                            result.add(new File(pf.getCanonicalFile(), name));
    -                        }
    -                    } catch (IOException e) {
    -                        handleError("IOException: " + path + " omitted");
    +                    .flatMap(Stream::of).forEach(path -> {
    +                    final File f = new File(dir, path);
    +                    if (Files.isSymbolicLink(f.toPath())) {
    +                        result.add(f);
    --- End diff --
    
    The previous code canonicalized the link's parent directory to deal with symlinks further up the tree, I think this is important for consumers of the returned set like `record` that so merges entries from several "directories" that actually are links to the same directory.
    
    To be honest I'm not sure about the real impact but I guess we better keep the existing behavior.


---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org