rpms/qpidc/devel corosync.patch,1.4,1.5

[Nuno Santos]

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24068

Modified Files:
	corosync.patch 
Log Message:
fix patch

corosync.patch:

Index: corosync.patch
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/corosync.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- corosync.patch	8 Jan 2009 22:43:43 -0000	1.4
+++ corosync.patch	9 Jan 2009 16:04:27 -0000	1.5
@@ -1,9 +1,11 @@
---- src/qpid/cluster/Cpg.cpp	2009-01-08 17:34:25.000000000 -0500
-+++ src/qpid/cluster/Cpg.cpp	2008-12-17 18:44:04.000000000 -0500
-@@ -126,27 +126,36 @@
+--- src/qpid/cluster/Cpg.cpp	2008-12-17 18:44:04.000000000 -0500
++++ src/qpid/cluster/Cpg.cpp	2009-01-09 10:57:05.000000000 -0500
+@@ -126,28 +126,37 @@
      }
  }
  
+-void Cpg::dispatch(cpg_dispatch_t type) {
+-    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
 +void Cpg::dispatchOne() {
 +    check(cpg_dispatch(handle,CPG_DISPATCH_ONE), "Error in CPG dispatch");
 +}
@@ -14,8 +16,6 @@
 +
 +void Cpg::dispatchBlocking() {
 +    check(cpg_dispatch(handle,CPG_DISPATCH_BLOCKING), "Error in CPG dispatch");
--void Cpg::dispatch(cpg_dispatch_t type) {
--    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
  }
  
  string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
@@ -27,24 +27,25 @@
        case CPG_ERR_INVALID_PARAM: return msg+": invalid param";
        case CPG_ERR_NO_MEMORY: return msg+": no memory";
        case CPG_ERR_BAD_HANDLE: return msg+": bad handle";
-+      case CPG_ERR_ACCESS: return msg+": access denied. You may need to set your group ID to 'ais'";
 -      case CPG_ERR_ACCESS: return msg+": access denied.";
++      case CPG_ERR_ACCESS: return msg+": access denied. You may need to set your group ID to 'ais'";
        case CPG_ERR_NOT_EXIST: return msg+": not exist";
        case CPG_ERR_EXIST: return msg+": exist";
        case CPG_ERR_NOT_SUPPORTED: return msg+": not supported";
+-      case CPG_ERR_SECURITY: return msg+": security";
+-      case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
 +        // The following are not mapped, or are incorrectly mapped in corosync 0-92-5
 +        // case CPG_ERR_LIBRARY: return msg+": library";
 +        // case CPG_ERR_SECURITY: return msg+": security";
 +        // case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
 +
--      case CPG_ERR_SECURITY: return msg+": security";
--      case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
        default:
-+        return ": cpg error";
 -        assert(0);
 -        return ": unknown";
++        return ": cpg error";
      };
  }
+ 
 --- src/qpid/cluster/Cpg.h	2009-01-08 17:25:30.000000000 -0500
 +++ src/qpid/cluster/Cpg.h	2008-12-17 18:44:04.000000000 -0500
 @@ -94,17 +94,9 @@