$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $ --- Lib/posixfile.py.orig 2001-10-25 00:03:35.000000000 +0200 +++ Lib/posixfile.py 2004-08-28 12:02:35.000000000 +0200 @@ -182,11 +182,11 @@ # Hack by davem@magnet.com to get locking to go on freebsd; # additions for AIX by Vladimir.Marangozov@imag.fr import sys, os - if sys.platform in ('netbsd1', + if sys.platform in ('netbsd1', 'netbsd2', 'openbsd2', 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'bsdos2', 'bsdos3', 'bsdos4'): - flock = struct.pack('lxxxxlxxxxlhh', \ + flock = struct.pack('qqihh', \ l_start, l_len, os.getpid(), l_type, l_whence) elif sys.platform in ['aix3', 'aix4']: flock = struct.pack('hhlllii', \ @@ -198,12 +198,12 @@ flock = fcntl.fcntl(self._file_.fileno(), cmd, flock) if '?' in how: - if sys.platform in ('netbsd1', + if sys.platform in ('netbsd1', 'netbsd2' 'openbsd2', 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'bsdos2', 'bsdos3', 'bsdos4'): l_start, l_len, l_pid, l_type, l_whence = \ - struct.unpack('lxxxxlxxxxlhh', flock) + struct.unpack('qqihh', flock) elif sys.platform in ['aix3', 'aix4']: l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \ struct.unpack('hhlllii', flock)