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

List:       intermezzo-cvs
Subject:    CVS: intermezzo/lento/Lento Fileset.pm,1.10.2.5,1.10.2.6
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
In directory usw-pr-cvs1:/tmp/cvs-serv7725

Modified Files:
      Tag: b1_0_0
	Fileset.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: Fileset.pm
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/lento/Lento/Fileset.pm,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -U2 -r1.10.2.5 -r1.10.2.6
--- Fileset.pm	2001/03/30 15:07:11	1.10.2.5
+++ Fileset.pm	2001/04/27 01:56:39	1.10.2.6
@@ -458,5 +458,6 @@
          # XXX: Where does this really go?
 	     if ($fset->{state} eq "conflict") {
-		    die "Conflicts during initial GetPermit - reint\n";
+		    print "Conflicts during initial GetPermit - reint\n";
+		    exit 101;
 	     }
 	     $fset->synced('yes');


_______________________________________________
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]