Author: bodewig
Date: Wed Dec 3 07:50:20 2008
New Revision: 722942
URL: http://svn.apache.org/viewvc?rev=722942&view=rev
Log:
don't say a file was modified in the future if it has been modified a second
ago. PR 43665. Submitted by Kim Hansen.
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DependSet.java
Modified: ant/core/trunk/CONTRIBUTORS
URL:
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=722942&r1=722941&r2=722942&view=diff
==============================================================================
Binary files - no diff available.
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=722942&r1=722941&r2=722942&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Dec 3 07:50:20 2008
@@ -300,6 +300,11 @@
using TraX) before falling back to Ant's own classpath.
Bugzilla Report 46172.
+ * <dependset> complained about files being modified in the future if
+ they had been just very recently (within Ant's assumed granularity
+ of the file system).
+ Bugzilla Report 43665.
+
Other changes:
--------------
Modified: ant/core/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=722942&r1=722941&r2=722942&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Wed Dec 3 07:50:20 2008
@@ -668,6 +668,10 @@
<last>Grey</last>
</name>
<name>
+ <first>Kim</first>
+ <last>Hansen</last>
+ </name>
+ <name>
<first>Kirk</first>
<last>Wylie</last>
</name>
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DependSet.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DependSet.java?rev=722942&r1=722941&r2=722942&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DependSet.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DependSet.java Wed
Dec 3 07:50:20 2008
@@ -197,6 +197,9 @@
= new org.apache.tools.ant.types.resources.selectors.Date();
datesel.setMillis(System.currentTimeMillis());
datesel.setWhen(TimeComparison.AFTER);
+ // don't whine because a file has changed during the last
+ // second (or whathever our current granularity may be)
+ datesel.setGranularity(0);
logFuture(targets, datesel);
int neTargets = new NonExistent(targets).size();
