Author: peterreilly
Date: Sun Sep 17 15:53:35 2006
New Revision: 447165
URL: http://svn.apache.org/viewvc?view=rev&rev=447165
Log:
bugzilla report 37386: <checksum> with file and todir fails
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=447165&r1=447164&r2=447165
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Sep 17 15:53:35 2006
@@ -10,6 +10,8 @@
Fixed bugs:
-----------
+* <checksum> with file and todir option failed. Bugzilla report 37386.
+
Other changes:
--------------
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java?view=diff&rev=447165&r1=447164&r2=447165
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java Sun Sep
17 15:53:35 2006
@@ -398,6 +398,10 @@
}
}
if (file != null) {
+ if (totalproperty != null || todir != null) {
+ relativeFilePaths.put(
+ file, file.getName().replace(File.separatorChar, '/'));
+ }
addToIncludeFileMap(file);
}
return generateChecksums();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
