[Unison-hackers] [unison-svn] r507 - trunk/src

[vouillon at seas.upenn.edu]

Author: vouillon
Date: 2012-09-14 04:54:50 -0400 (Fri, 14 Sep 2012)
New Revision: 507

Modified:
   trunk/src/RECENTNEWS
   trunk/src/fswatch.ml
   trunk/src/mkProjectInfo.ml
Log:
* Fix Unix.readlink invalid argument error under Windows


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2012-08-09 14:30:22 UTC (rev 506)
+++ trunk/src/RECENTNEWS	2012-09-14 08:54:50 UTC (rev 507)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.46.2
+
+* Fix Unix.readlink invalid argument error under Windows
+
+-------------------------------
 CHANGES FROM VERSION 2.46.1
 
 * More robust file watching helper programs for Windows and Linux.

Modified: trunk/src/fswatch.ml
===================================================================
--- trunk/src/fswatch.ml	2012-08-09 14:30:22 UTC (rev 506)
+++ trunk/src/fswatch.ml	2012-09-14 08:54:50 UTC (rev 507)
@@ -243,7 +243,7 @@
   try
     (* Linux *)
     [System.fspathFromString (Unix.readlink "/proc/self/exe")]
-  with Unix.Unix_error _ ->
+  with Unix.Unix_error _ | Invalid_argument _ ->
     let name = (System.argv ()).(0) in
     if not (Filename.is_relative name) then
       [System.fspathFromString name]

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2012-08-09 14:30:22 UTC (rev 506)
+++ trunk/src/mkProjectInfo.ml	2012-09-14 08:54:50 UTC (rev 507)
@@ -81,3 +81,4 @@
 
 
 
+