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 2016/05/01 06:43:30 UTC
[1/3] ant git commit: whitespace
Repository: ant
Updated Branches:
refs/heads/master a80c75af5 -> 0c2ca5525
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/434193d0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/434193d0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/434193d0
Branch: refs/heads/master
Commit: 434193d088f3b5b526ed7d7ff5ea21917c9b90d9
Parents: 03481a6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun May 1 06:35:51 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun May 1 06:35:51 2016 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/Get.java | 28 ++++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/434193d0/src/main/org/apache/tools/ant/taskdefs/Get.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index c636ab5..5ff9a54 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -135,23 +135,23 @@ public class Get extends Task {
}
}
- //set up logging
- final int logLevel = Project.MSG_INFO;
- DownloadProgress progress = null;
- if (verbose) {
- progress = new VerboseProgress(System.out);
- }
+ //set up logging
+ final int logLevel = Project.MSG_INFO;
+ DownloadProgress progress = null;
+ if (verbose) {
+ progress = new VerboseProgress(System.out);
+ }
- //execute the get
- try {
- doGet(source, dest, logLevel, progress);
- } catch (final IOException ioe) {
- log("Error getting " + source + " to " + dest);
- if (!ignoreErrors) {
- throw new BuildException(ioe, getLocation());
+ //execute the get
+ try {
+ doGet(source, dest, logLevel, progress);
+ } catch (final IOException ioe) {
+ log("Error getting " + source + " to " + dest);
+ if (!ignoreErrors) {
+ throw new BuildException(ioe, getLocation());
+ }
}
}
- }
}
/**
[3/3] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0c2ca552
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0c2ca552
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0c2ca552
Branch: refs/heads/master
Commit: 0c2ca5525577917b25a6a053e77535fe03c12601
Parents: a80c75a 647bdfb
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun May 1 06:43:01 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun May 1 06:43:01 2016 +0200
----------------------------------------------------------------------
WHATSNEW | 3 ++
src/main/org/apache/tools/ant/taskdefs/Get.java | 30 ++++++++++----------
2 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0c2ca552/WHATSNEW
----------------------------------------------------------------------
[2/3] ant git commit: 's quiet attribute is broken
Posted by bo...@apache.org.
<get>'s quiet attribute is broken
https://bz.apache.org/bugzilla/show_bug.cgi?id=59379
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/647bdfb2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/647bdfb2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/647bdfb2
Branch: refs/heads/master
Commit: 647bdfb2d72ba111d9c6944351bd8b9392056b05
Parents: 434193d
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun May 1 06:41:11 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun May 1 06:41:11 2016 +0200
----------------------------------------------------------------------
WHATSNEW | 3 +++
src/main/org/apache/tools/ant/taskdefs/Get.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/647bdfb2/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 681b5cf..68338fc 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -12,6 +12,9 @@ Fixed bugs:
they have specified.
Bugzilla Report 59339
+ * <get>'s quiet attribute was broken, it didn't suppress any messages.
+ Bugzilla Report 59379
+
Other changes:
--------------
http://git-wip-us.apache.org/repos/asf/ant/blob/647bdfb2/src/main/org/apache/tools/ant/taskdefs/Get.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 5ff9a54..6c53790 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -259,7 +259,7 @@ public class Get extends Task {
@Override
public void log(final String msg, final int msgLevel) {
- if (!quiet || msgLevel >= Project.MSG_ERR) {
+ if (!quiet || msgLevel <= Project.MSG_ERR) {
super.log(msg, msgLevel);
}
}