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

[Benjamin C. Pierce]

Author: bcpierce
Date: 2008-06-24 10:55:54 -0400 (Tue, 24 Jun 2008)
New Revision: 291

Modified:
   trunk/src/RECENTNEWS
   trunk/src/copy.ml
   trunk/src/mkProjectInfo.ml
Log:
* Fix a small bug in the external copyprog setup.



Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2008-06-24 02:45:20 UTC (rev 290)
+++ trunk/src/RECENTNEWS	2008-06-24 14:55:54 UTC (rev 291)
@@ -1,3 +1,9 @@
+CHANGES FROM VERSION 2.29.6
+
+* Fix a small bug in the external copyprog setup.
+
+
+-------------------------------
 CHANGES FROM VERSION 2.29.5
 
 * Lots of little documentation tidying.  (In particular, I finally

Modified: trunk/src/copy.ml
===================================================================
--- trunk/src/copy.ml	2008-06-24 02:45:20 UTC (rev 290)
+++ trunk/src/copy.ml	2008-06-24 14:55:54 UTC (rev 291)
@@ -537,9 +537,9 @@
          Safelist.find (function Clroot.ConnectLocal _ -> false | _ -> true)
            (Safelist.map Clroot.parseRoot (Globals.rawRoots()))
       with
-        Clroot.ConnectByShell (_,h',uo,_,_) ->
+        Clroot.ConnectByShell (_,rawhost,uo,_,_) ->
             (match uo with None -> "" | Some u -> u ^ "@")
-          ^ h ^ ":"
+          ^ rawhost ^ ":"
           (* Note that we don't do anything with the port -- hopefully
              this will not affect many people.  If we did want to include it,
              we'd have to fiddle with the rsync parameters in a deeper way. *)

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2008-06-24 02:45:20 UTC (rev 290)
+++ trunk/src/mkProjectInfo.ml	2008-06-24 14:55:54 UTC (rev 291)
@@ -76,3 +76,4 @@
 
 
 
+