bodewig 2002/11/18 04:03:30
Modified: . Tag: ANT_15_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/cvslib Tag:
ANT_15_BRANCH ChangeLogTask.java
Log:
Merge fix for PR14397 from HEAD
Revision Changes Path
No revision
No revision
1.263.2.100 +2 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.99
retrieving revision 1.263.2.100
diff -u -r1.263.2.99 -r1.263.2.100
--- WHATSNEW 15 Nov 2002 13:14:40 -0000 1.263.2.99
+++ WHATSNEW 18 Nov 2002 12:03:29 -0000 1.263.2.100
@@ -29,6 +29,8 @@
* <cvstagdiff> would throw a NullPointException if there had been no
differences.
+* <cvschangelog> could miss today's changes.
+
Other changes:
--------------
No revision
No revision
1.14.2.3 +6 -6
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
Index: ChangeLogTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- ChangeLogTask.java 24 Jun 2002 02:28:08 -0000 1.14.2.2
+++ ChangeLogTask.java 18 Nov 2002 12:03:30 -0000 1.14.2.3
@@ -249,9 +249,10 @@
new SimpleDateFormat("yyyy-MM-dd");
// We want something of the form: -d ">=YYYY-MM-dd"
- final String dateRange = "-d >="
- + outputDate.format(m_start);
+ final String dateRange = ">=" + outputDate.format(m_start);
+ // Supply '-d' as a separate argument - Bug# 14397
+ command.createArgument().setValue("-d");
command.createArgument().setValue(dateRange);
}
@@ -262,7 +263,7 @@
while (e.hasMoreElements()) {
final FileSet fileSet = (FileSet) e.nextElement();
final DirectoryScanner scanner =
- fileSet.getDirectoryScanner(project);
+ fileSet.getDirectoryScanner(getProject());
final String[] files = scanner.getIncludedFiles();
for (int i = 0; i < files.length; i++) {
@@ -275,8 +276,7 @@
final RedirectingStreamHandler handler =
new RedirectingStreamHandler(parser);
- log("ChangeLog command: [" + command.toString() + "]",
- Project.MSG_VERBOSE);
+ log(command.describeCommand(), Project.MSG_VERBOSE);
final Execute exe = new Execute(handler);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
