Fri Jan 17 14:45:26 2014 UTC ()
Updated HOMEPAGE, remove obsolete MASTER_SITES.
Add patch for python-3.x compatibility.
(wiz)
diff -r1.2 -r1.3 pkgsrc/devel/py-lockfile/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/py-lockfile/distinfo
diff -r0 -r1.1 pkgsrc/devel/py-lockfile/patches/patch-lockfile_pidlockfile.py
--- pkgsrc/devel/py-lockfile/Makefile 2012/10/31 11:19:32 1.2
+++ pkgsrc/devel/py-lockfile/Makefile 2014/01/17 14:45:26 1.3
| @@ -1,20 +1,20 @@ | | | @@ -1,20 +1,20 @@ |
1 | # $NetBSD: Makefile,v 1.2 2012/10/31 11:19:32 asau Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2014/01/17 14:45:26 wiz Exp $ |
2 | # | | | |
3 | | | 2 | |
4 | DISTNAME= lockfile-0.9.1 | | 3 | DISTNAME= lockfile-0.9.1 |
5 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} |
6 | CATEGORIES= devel python | | 5 | CATEGORIES= devel python |
7 | MASTER_SITES= http://pylockfile.googlecode.com/files/ | | 6 | MASTER_SITES= # |
8 | | | 7 | |
9 | MAINTAINER= kamel.derouiche@gmail.com | | 8 | MAINTAINER= kamel.derouiche@gmail.com |
10 | HOMEPAGE= http://pypi.python.org/pypi/lockfile/ | | 9 | HOMEPAGE= https://github.com/smontanaro/pylockfile/ |
11 | COMMENT= Platform-independent file locking module | | 10 | COMMENT= Platform-independent file locking module |
12 | LICENSE= mit | | 11 | LICENSE= mit |
13 | | | 12 | |
14 | DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 | | 13 | DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 |
15 | | | 14 | |
16 | PYDISTUTILSPKG= yes | | 15 | PYDISTUTILSPKG= yes |
| | | 16 | |
17 | USE_LANGUAGES= # none | | 17 | USE_LANGUAGES= # none |
18 | | | 18 | |
19 | .include "../../lang/python/extension.mk" | | 19 | .include "../../lang/python/extension.mk" |
20 | .include "../../mk/bsd.pkg.mk" | | 20 | .include "../../mk/bsd.pkg.mk" |
--- pkgsrc/devel/py-lockfile/distinfo 2012/08/14 12:08:48 1.1
+++ pkgsrc/devel/py-lockfile/distinfo 2014/01/17 14:45:26 1.2
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
1 | $NetBSD: distinfo,v 1.1 2012/08/14 12:08:48 imil Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2014/01/17 14:45:26 wiz Exp $ |
2 | | | 2 | |
3 | SHA1 (lockfile-0.9.1.tar.gz) = 1eebaee375641c9f29aeb21768f917dd2b985752 | | 3 | SHA1 (lockfile-0.9.1.tar.gz) = 1eebaee375641c9f29aeb21768f917dd2b985752 |
4 | RMD160 (lockfile-0.9.1.tar.gz) = c94c1a638f2a11181063d6025a6c5acc8c9d09e6 | | 4 | RMD160 (lockfile-0.9.1.tar.gz) = c94c1a638f2a11181063d6025a6c5acc8c9d09e6 |
5 | Size (lockfile-0.9.1.tar.gz) = 16949 bytes | | 5 | Size (lockfile-0.9.1.tar.gz) = 16949 bytes |
| | | 6 | SHA1 (patch-lockfile_pidlockfile.py) = 0b675b6e656e803d59875814391a7ec3ca95abac |
$NetBSD: patch-lockfile_pidlockfile.py,v 1.1 2014/01/17 14:45:26 wiz Exp $
python-3.x compatibility.
--- lockfile/pidlockfile.py.orig 2010-09-19 13:39:17.000000000 +0000
+++ lockfile/pidlockfile.py
@@ -77,7 +77,7 @@ class PIDLockFile(LockBase):
while True:
try:
write_pid_to_pidfile(self.path)
- except OSError, exc:
+ except OSError as exc:
if exc.errno == errno.EEXIST:
# The lock creation failed. Maybe sleep a bit.
if timeout is not None and time.time() > end_time:
@@ -155,7 +155,7 @@ def write_pid_to_pidfile(pidfile_path):
"""
open_flags = (os.O_CREAT | os.O_EXCL | os.O_WRONLY)
- open_mode = 0644
+ open_mode = 0o644
pidfile_fd = os.open(pidfile_path, open_flags, open_mode)
pidfile = os.fdopen(pidfile_fd, 'w')
@@ -182,7 +182,7 @@ def remove_existing_pidfile(pidfile_path
"""
try:
os.remove(pidfile_path)
- except OSError, exc:
+ except OSError as exc:
if exc.errno == errno.ENOENT:
pass
else: