You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/12/19 09:22:52 UTC
[1/3] ant git commit: Properties#list shortens values in output
Repository: ant
Updated Branches:
refs/heads/master 6e6b6d419 -> 6aeb7d329
Properties#list shortens values in output
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d88b87fd
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d88b87fd
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d88b87fd
Branch: refs/heads/master
Commit: d88b87fd8b239240d5292cf93646c0c609c1144f
Parents: 6e6b6d4
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 19 10:21:58 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 19 10:21:58 2017 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/taskdefs/optional/unix/Symlink.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/d88b87fd/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index 8a27212..0c5c819 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -553,8 +553,15 @@ public class Symlink extends DispatchTask {
+ " or its parent dir; skipping it.");
continue;
}
+ try {
+ lnks.store(new PrintStream(
+ new LogOutputStream(this, Project.MSG_INFO)),
+ "listing properties");
+ } catch (IOException ex) {
+ log("failed to log unshortened properties");
lnks.list(new PrintStream(
new LogOutputStream(this, Project.MSG_INFO)));
+ }
// Write the contents to our master list of links
// This method assumes that all links are defined in
// terms of absolute paths, or paths relative to the
[2/3] ant git commit: whitespace
Posted by bo...@apache.org.
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/edb27a34
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/edb27a34
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/edb27a34
Branch: refs/heads/master
Commit: edb27a348d29821f849e0b9a4a18bae5e19e6853
Parents: d88b87f
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 19 10:22:27 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 19 10:22:27 2017 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/taskdefs/optional/unix/Symlink.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/edb27a34/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index 0c5c819..591d726 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -559,8 +559,8 @@ public class Symlink extends DispatchTask {
"listing properties");
} catch (IOException ex) {
log("failed to log unshortened properties");
- lnks.list(new PrintStream(
- new LogOutputStream(this, Project.MSG_INFO)));
+ lnks.list(new PrintStream(
+ new LogOutputStream(this, Project.MSG_INFO)));
}
// Write the contents to our master list of links
// This method assumes that all links are defined in
[3/3] ant git commit: improve debug logging
Posted by bo...@apache.org.
improve debug logging
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6aeb7d32
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6aeb7d32
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6aeb7d32
Branch: refs/heads/master
Commit: 6aeb7d32938b5cc31ba1bc45856bd831180f8137
Parents: edb27a3
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 19 10:22:34 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 19 10:22:34 2017 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/taskdefs/optional/unix/Symlink.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/6aeb7d32/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index 591d726..3f8ec43 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -211,6 +211,8 @@ public class Symlink extends DispatchTask {
// it's already a symlink and the symlink target is the same
// as the target noted in the properties file. So there's no
// need to recreate it
+ log("not recreating " + lnk + " as it points to the correct target already" ,
+ Project.MSG_DEBUG);
continue;
}
} catch (IOException e) {
@@ -445,6 +447,7 @@ public class Symlink extends DispatchTask {
// if the path (at which the link is expected to be created) isn't already present
// then we just go ahead and attempt to symlink
try {
+ log("creating symlink " + link + " -> " + target, Project.MSG_DEBUG);
Files.createSymbolicLink(link, target);
} catch (IOException e) {
if (failonerror) {
@@ -468,6 +471,8 @@ public class Symlink extends DispatchTask {
return;
}
try {
+ log("creating symlink " + link + " -> " + target + " after removing original",
+ Project.MSG_DEBUG);
Files.createSymbolicLink(link, target);
} catch (IOException e) {
if (failonerror) {