[Nant-commits] CVS: nant/src/NAnt DirectoryScanner.cs,1.3,1.4 FileSet.cs,1.8,1.9

[Gerry S. <ger...@us...>]

Update of /cvsroot/nant/nant/src/NAnt
In directory usw-pr-cvs1:/tmp/cvs-serv16654/src/NAnt

Modified Files:
	DirectoryScanner.cs FileSet.cs 
Log Message:
* removed previous file name with spaces fixed
The previous fix was applied from a user using nant 0.6.  I applied the changes without checking to see if the error had already been fixed which it had.  Whoops!  My bad.


Index: DirectoryScanner.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/DirectoryScanner.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DirectoryScanner.cs	2001/12/18 18:51:32	1.3
--- DirectoryScanner.cs	2001/12/21 00:10:27	1.4
***************
*** 127,134 ****
                  string filename = Path.Combine(path, fileInfo.Name);
                  if (IsPathIncluded(filename)) {
-                     // quote file name if it has spaces in it
-                     if (filename.IndexOf(' ') >= 0) {
-                         filename = '"' + filename + '"';
-                     }
                      _fileNames.Add(filename);
                  }
--- 127,130 ----

Index: FileSet.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/FileSet.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FileSet.cs	2001/12/18 18:51:32	1.8
--- FileSet.cs	2001/12/21 00:10:27	1.9
***************
*** 34,44 ****
          public static bool MoreRecentLastWriteTime(StringCollection fileNames, DateTime targetLastWriteTime) {
              foreach (string fileName in fileNames) {
!                 // remove quotes if present from filename
!                 string tempFileName = fileName;
!                 if (tempFileName.StartsWith("\"")) {
!                     tempFileName = tempFileName.Substring(1, tempFileName.Length - 2);
!                 }
!                 FileInfo fileInfo = new FileInfo(tempFileName);
! 
                  if (!fileInfo.Exists) {
                      return true;
--- 34,38 ----
          public static bool MoreRecentLastWriteTime(StringCollection fileNames, DateTime targetLastWriteTime) {
              foreach (string fileName in fileNames) {
!                 FileInfo fileInfo = new FileInfo(fileName);
                  if (!fileInfo.Exists) {
                      return true;