projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3cf7b2a
)
fix lockfile wrapper; it was sloppily constructed.
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Fri, 5 Sep 2008 17:09:26 +0000
(13:09 -0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Fri, 5 Sep 2008 17:09:26 +0000
(13:09 -0400)
src/common
patch
|
blob
|
history
diff --git
a/src/common
b/src/common
index 4fec4520026ea02e6e696108778848cd2daf3abd..40ba8de0c9eb7dc3504ba3535b737329cd878930 100644
(file)
--- a/
src/common
+++ b/
src/common
@@
-103,6
+103,7
@@
lock() {
if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then
if ! ( which lockfile >/dev/null ); then
failure "Neither lockfile-create nor lockfile are in the path!"
if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then
if ! ( which lockfile >/dev/null ); then
failure "Neither lockfile-create nor lockfile are in the path!"
+ fi
use_lockfileprogs=
fi
use_lockfileprogs=
fi
@@
-116,9
+117,9
@@
lock() {
;;
touch)
if [ -n "$use_lockfileprogs" ] ; then
;;
touch)
if [ -n "$use_lockfileprogs" ] ; then
- lockfile-touch "$file"
+ lockfile-touch
--oneshot
"$file"
else
else
-
#
Nothing to do here
+
:
Nothing to do here
fi
;;
remove)
fi
;;
remove)
@@
-131,7
+132,7
@@
lock() {
*)
failure "bad argument for lock subfunction '$action'"
esac
*)
failure "bad argument for lock subfunction '$action'"
esac
-}
+
# check that characters are in a string (in an AND fashion).
# used for checking key capability
# check that characters are in a string (in an AND fashion).
# used for checking key capability
@@
-788,7
+789,7
@@
update_known_hosts() {
esac
# touch the lockfile, for good measure.
esac
# touch the lockfile, for good measure.
- lock touch
--oneshot
"$KNOWN_HOSTS"
+ lock touch "$KNOWN_HOSTS"
done
# remove the lockfile and the trap
done
# remove the lockfile and the trap
@@
-931,7
+932,7
@@
update_authorized_keys() {
esac
# touch the lockfile, for good measure.
esac
# touch the lockfile, for good measure.
- lock touch
--oneshot
"$AUTHORIZED_KEYS"
+ lock touch "$AUTHORIZED_KEYS"
done
# remove the lockfile and the trap
done
# remove the lockfile and the trap