Browse Source

Merge branch '1.9.x'

master
Stefan Bodewig 9 years ago
parent
commit
0c2ca55255
2 changed files with 18 additions and 15 deletions
  1. +3
    -0
      WHATSNEW
  2. +15
    -15
      src/main/org/apache/tools/ant/taskdefs/Get.java

+ 3
- 0
WHATSNEW View File

@@ -18,6 +18,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:
--------------



+ 15
- 15
src/main/org/apache/tools/ant/taskdefs/Get.java View File

@@ -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());
}
}
}
}
}

/**
@@ -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);
}
}


Loading…
Cancel
Save