diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-12 01:46:15 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-12 01:46:15 -0400 |
| commit | 76f242f43c2d835d332ee9c449e2858ead571acb (patch) | |
| tree | 8e0b2089000f362088141907c65ba199099f40c2 | |
| parent | d3e96a9a428d868eb095674af35bc82b5f098c7d (diff) | |
further lockfile debugging.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | packaging/freebsd/Makefile | 1 | ||||
| -rw-r--r-- | src/common | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index b034c88..fb0788e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ monkeysphere (0.16~pre-1) UNRELEASED; urgency=low [ Daniel Kahn Gillmor ] * replaced "#!/bin/bash" with "#!/usr/bin/env bash" for better portability. + * fixed busted lockfile arrangement, where empty file was being locked -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Thu, 11 Sep 2008 23:16:31 -0400 diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile index 2937d69..a03c108 100644 --- a/packaging/freebsd/Makefile +++ b/packaging/freebsd/Makefile @@ -21,6 +21,7 @@ COMMENT= use the OpenPGP web of trust to verify ssh connections LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls RUN_DEPENDS= base64:${PORTSDIR}/converters/base64 \ gpg:${PORTSDIR}/security/gnupg \ + lockfile:${PORTSDIR}/mail/procmail \ bash:${PORTSDIR}/shells/bash MAN1= monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1 @@ -98,7 +98,7 @@ cutline() { lock() { local use_lockfileprogs=true local action="$1" - local file="$file" + local file="$2" if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then if ! ( which lockfile >/dev/null ); then |