From 434193d088f3b5b526ed7d7ff5ea21917c9b90d9 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 1 May 2016 06:35:51 +0200 Subject: [PATCH 1/2] whitespace --- .../org/apache/tools/ant/taskdefs/Get.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index c636ab54c..5ff9a5403 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()); + } } } - } } /** From 647bdfb2d72ba111d9c6944351bd8b9392056b05 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 1 May 2016 06:41:11 +0200 Subject: [PATCH 2/2] 's quiet attribute is broken https://bz.apache.org/bugzilla/show_bug.cgi?id=59379 --- WHATSNEW | 3 +++ src/main/org/apache/tools/ant/taskdefs/Get.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 681b5cf4b..68338fca7 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -12,6 +12,9 @@ Fixed bugs: they have specified. Bugzilla Report 59339 + * 's quiet attribute was broken, it didn't suppress any messages. + Bugzilla Report 59379 + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index 5ff9a5403..6c5379079 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); } }