[h5py] 06/455: OS X type mismatch in h5g

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag 1.3.0
in repository h5py.

commit 2b224a894f424db4b01ba1dcbd3dd1aab3431ed1
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Tue May 6 00:32:54 2008 +0000

    OS X type mismatch in h5g
---
 MANIFEST.in  | 4 ++--
 h5py/h5g.pyx | 4 ++--
 setup.py     | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index e2c2257..57e2a77 100755
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,9 @@
 include MANIFEST.in
 include LICENSE.txt
 include README.txt
-include INSTALL.txt
+include docs.cfg
 recursive-include h5py *.py *.pyx *.pxd
-recursive-include h5py *.h *.c *.hdf5
+recursive-include h5py utils.c utils.h *.hdf5
 recursive-include licenses *
 recursive-include docs *
 
diff --git a/h5py/h5g.pyx b/h5py/h5g.pyx
index 741d910..a1abea4 100755
--- a/h5py/h5g.pyx
+++ b/h5py/h5g.pyx
@@ -57,7 +57,7 @@ cdef class GroupStat:
     """
     cdef public object fileno  # will be a 2-tuple
     cdef public object objno   # will be a 2-tuple
-    cdef public unsigned nlink
+    cdef public int nlink
     cdef public int type
     cdef public time_t mtime
     cdef public size_t linklen
@@ -222,7 +222,7 @@ def get_objinfo(hid_t loc_id, char* name, int follow_link=1):
     statobj = GroupStat()
     statobj.fileno = (stat.fileno[0], stat.fileno[1])
     statobj.objno = (stat.objno[0], stat.objno[1])
-    statobj.nlink = stat.nlink
+    statobj.nlink = <int>stat.nlink
     statobj.type = <int>stat.type
     statobj.mtime = stat.mtime
     statobj.linklen = stat.linklen
diff --git a/setup.py b/setup.py
index c668ae6..549f4dd 100755
--- a/setup.py
+++ b/setup.py
@@ -49,6 +49,11 @@ import sys
 # fails under a wide variety of network filesystems under Linux.
 delattr(os, 'link') # goodbye!
 
+try:
+    os.remove('MANIFEST') # why the hell are we caching this information
+except OSError:
+    pass
+
 # === Global constants ========================================================
 
 NAME = 'h5py'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git