From: Evan Broder <broder@mit.edu>
Date: Sun, 4 Jan 2009 03:32:12 +0000 (-0500)
Subject: Use afs_error_message instead of the more conflicting error_message.
X-Git-Tag: 0.1.0~79
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/commitdiff_plain/8de7871a5e5f6187514d5021fdfae89847933401

Use afs_error_message instead of the more conflicting error_message.

Signed-off-by: Evan Broder <broder@mit.edu>
---

diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index 65f0140..8a5751c 100644
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -32,7 +32,7 @@ cdef class PTS:
                               (AFSDIR_CLIENT_ETC_DIRPATH, strerror(errno)))
         code = afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info)
         if code != 0:
-            raise Exception(code, "GetCellInfo: %s" % error_message(code))
+            raise Exception(code, "GetCellInfo: %s" % afs_error_message(code))
         
         if sec > 0:
             strncpy(prin.cell, info.name, sizeof(prin.cell))
@@ -43,7 +43,7 @@ cdef class PTS:
             if code != 0:
                 if sec >= 2:
                     # No really - we wanted authentication
-                    raise Exception(code, "Failed to get token for service AFS: %s" % error_message(code))
+                    raise Exception(code, "Failed to get token for service AFS: %s" % afs_error_message(code))
                 sec = 0
             else:
                 if sec == 3:
@@ -69,7 +69,7 @@ cdef class PTS:
         
         code = ubik_ClientInit(serverconns, &self.client)
         if code != 0:
-            raise Exception("Failed to initialize ubik connection to Protection server: %s" % error_message(code))
+            raise Exception("Failed to initialize ubik connection to Protection server: %s" % afs_error_message(code))
         
         code = rxs_Release(sc)
     
diff --git a/afs/afs.pxd b/afs/afs.pxd
index b4057c8..057c2a7 100644
--- a/afs/afs.pxd
+++ b/afs/afs.pxd
@@ -128,4 +128,4 @@ cdef extern from "ubik.h":
     afs_int32 ubik_ClientDestroy(ubik_client *aclient)
 
 cdef extern from "afs/com_err.h":
-    char * error_message(int)
+    char * afs_error_message(int)