conor 2003/02/13 05:31:41
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Zip.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.78.2.8 +9 -2 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.78.2.7
retrieving revision 1.78.2.8
diff -u -w -u -r1.78.2.7 -r1.78.2.8
--- Zip.java 10 Feb 2003 14:24:46 -0000 1.78.2.7
+++ Zip.java 13 Feb 2003 13:31:41 -0000 1.78.2.8
@@ -614,8 +614,15 @@
File[] files = grabFiles(scanners, fileNames);
if (files.length == 0) {
if (emptyBehavior.equals("skip")) {
- log("Warning: skipping " + archiveType + " archive " +
zipFile +
- " because no files were included.", Project.MSG_WARN);
+ if (doUpdate) {
+ log(archiveType + " archive " + zipFile
+ + " not updated because no new files were
included.",
+ Project.MSG_VERBOSE);
+ } else {
+ log("Warning: skipping " + archiveType + " archive "
+ + zipFile + " because no files were included.",
+ Project.MSG_WARN);
+ }
return true;
} else if (emptyBehavior.equals("fail")) {
throw new BuildException("Cannot create " + archiveType
