mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-18 08:02:48 +00:00
- Update to 1.6
- Remove non working patch for py-lockfile (upstream has fixed it now) - Pet portlint PR: ports/187355 Submitted by: myself Approved by: maintainer timeout (2 weeks)
This commit is contained in:
parent
9b588a49ff
commit
c6a23ac005
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=348733
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= daemon
|
||||
PORTVERSION= 1.5.5
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 1.6
|
||||
CATEGORIES= devel python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
@ -19,5 +18,4 @@ USE_PYTHON= yes
|
||||
USE_PYDISTUTILS= yes
|
||||
PYDISTUTILS_AUTOPLIST= yes
|
||||
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (python-daemon-1.5.5.tar.gz) = 1406962e48ce03642c6057f40f9ffd49493792a7b34357fe9e264708748c83c0
|
||||
SIZE (python-daemon-1.5.5.tar.gz) = 41045
|
||||
SHA256 (python-daemon-1.6.tar.gz) = 1665fb16bfeae72f16aa2de40bc75661458bd42731a7d463a911a8d5eaf96c0b
|
||||
SIZE (python-daemon-1.6.tar.gz) = 41564
|
||||
|
@ -1,72 +0,0 @@
|
||||
--- daemon/pidlockfile.py.orig 2010-08-24 16:57:37.753374406 +0000
|
||||
+++ daemon/pidlockfile.py 2010-08-24 16:58:57.825989360 +0000
|
||||
@@ -22,6 +22,7 @@
|
||||
NotLocked, NotMyLock,
|
||||
)
|
||||
|
||||
+from lockfile.pidlockfile import PIDLockFile
|
||||
|
||||
class PIDFileError(Exception):
|
||||
""" Abstract base class for errors specific to PID files. """
|
||||
@@ -30,61 +31,6 @@
|
||||
""" Raised when parsing contents of PID file fails. """
|
||||
|
||||
|
||||
-class PIDLockFile(LinkFileLock, object):
|
||||
- """ Lockfile implemented as a Unix PID file.
|
||||
-
|
||||
- The PID file is named by the attribute `path`. When locked,
|
||||
- the file will be created with a single line of text,
|
||||
- containing the process ID (PID) of the process that acquired
|
||||
- the lock.
|
||||
-
|
||||
- The lock is acquired and maintained as per `LinkFileLock`.
|
||||
-
|
||||
- """
|
||||
-
|
||||
- def read_pid(self):
|
||||
- """ Get the PID from the lock file.
|
||||
- """
|
||||
- result = read_pid_from_pidfile(self.path)
|
||||
- return result
|
||||
-
|
||||
- def acquire(self, *args, **kwargs):
|
||||
- """ Acquire the lock.
|
||||
-
|
||||
- Locks the PID file then creates the PID file for this
|
||||
- lock. The `timeout` parameter is used as for the
|
||||
- `LinkFileLock` class.
|
||||
-
|
||||
- """
|
||||
- super(PIDLockFile, self).acquire(*args, **kwargs)
|
||||
- try:
|
||||
- write_pid_to_pidfile(self.path)
|
||||
- except OSError, exc:
|
||||
- error = LockFailed("%(exc)s" % vars())
|
||||
- raise error
|
||||
-
|
||||
- def release(self):
|
||||
- """ Release the lock.
|
||||
-
|
||||
- Removes the PID file then releases the lock, or raises an
|
||||
- error if the current process does not hold the lock.
|
||||
-
|
||||
- """
|
||||
- if self.i_am_locking():
|
||||
- remove_existing_pidfile(self.path)
|
||||
- super(PIDLockFile, self).release()
|
||||
-
|
||||
- def break_lock(self):
|
||||
- """ Break an existing lock.
|
||||
-
|
||||
- If the lock is held, breaks the lock and removes the PID
|
||||
- file.
|
||||
-
|
||||
- """
|
||||
- super(PIDLockFile, self).break_lock()
|
||||
- remove_existing_pidfile(self.path)
|
||||
-
|
||||
-
|
||||
class TimeoutPIDLockFile(PIDLockFile):
|
||||
""" Lockfile with default timeout, implemented as a Unix PID file.
|
||||
|
Loading…
Reference in New Issue
Block a user