[prev in list] [next in list] [prev in thread] [next in thread] 

List:       intermezzo-cvs
Subject:    CVS: intermezzo/lento/Lento/InterMezzo ReqHandler.pm,1.127.2.23,1.127.2.24
From:       Christopher Li <christopher_li () users ! sourceforge ! net>
Date:       2001-04-27 1:56:41
[Download RAW message or body]

Update of /cvsroot/intermezzo/intermezzo/lento/Lento/InterMezzo
In directory usw-pr-cvs1:/tmp/cvs-serv7725/InterMezzo

Modified Files:
      Tag: b1_0_0
	ReqHandler.pm 
Log Message:
Give lento a error return code for the conflict.
FIXME: what is the right error code? I am it up to 100 and 101.



Index: ReqHandler.pm
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/lento/Lento/InterMezzo/ReqHandler.pm,v
retrieving revision 1.127.2.23
retrieving revision 1.127.2.24
diff -U2 -r1.127.2.23 -r1.127.2.24
--- ReqHandler.pm	2001/04/06 20:20:43	1.127.2.23
+++ ReqHandler.pm	2001/04/27 01:56:39	1.127.2.24
@@ -871,5 +871,6 @@
              if ($::psdev->get_kml_size($fset->mtpt()) - $max_local_offset) {
                  DEBUG($replicator->printme()." kml \
                size=".$::psdev->get_kml_size($fset->mtpt())." local offs= \
                $max_local_offset\n");
-                 die "Possible conflict; resync manually\n";
+                 print "Possible conflict; resync manually\n";
+		 exit 100;
              }
              


_______________________________________________
intermezzo-commit mailing list
intermezzo-commit@lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/intermezzo-commit


[prev in list] [next in list] [prev in thread] [next in thread]