Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/common.sh
diff options
context:
space:
mode:
Diffstat (limited to 'lib/common.sh')
-rw-r--r--lib/common.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/common.sh b/lib/common.sh
index 91a55dc..70752ff 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -138,7 +138,11 @@ get_full_version() {
# usage : lock( $fd, $file, $message )
##
lock() {
- eval "exec $1>"'"$2"'
+ # Only reopen the FD if it wasn't handed to us
+ if ! [[ "/dev/fd/$1" -ef "$2" ]]; then
+ eval "exec $1>"'"$2"'
+ fi
+
if ! flock -n $1; then
stat_busy "$3"
flock $1
@@ -150,7 +154,11 @@ lock() {
# usage : slock( $fd, $file, $message )
##
slock() {
- eval "exec $1>"'"$2"'
+ # Only reopen the FD if it wasn't handed to us
+ if ! [[ "/dev/fd/$1" -ef "$2" ]]; then
+ eval "exec $1>"'"$2"'
+ fi
+
if ! flock -sn $1; then
stat_busy "$3"
flock -s $1