Joerg Jaspert pushed to branch deploy at Debian FTP Team / dak
Commits:
-
b750a2ab
by Bastian Blank at 2018-05-20T08:24:34+02:00
-
1d7b57e7
by Joerg Jaspert at 2018-05-20T08:28:29+00:00
-
265c4b1d
by Bastian Blank at 2018-05-20T08:29:24+00:00
-
a5ca6a6d
by Joerg Jaspert at 2018-05-20T08:34:09+00:00
-
3253f6c7
by Joerg Jaspert at 2018-05-20T10:51:40+02:00
2 changed files:
Changes:
... | ... | @@ -223,9 +223,18 @@ function lock() { |
223 | 223 |
LOCKFILE=${!lvar}
|
224 | 224 |
fi
|
225 | 225 |
|
226 |
+ # bash can't open a file read-only, while creating it,
|
|
227 |
+ # so we need to create it ourselves.
|
|
228 |
+ if ! [[ -e $LOCKFILE ]]; then
|
|
229 |
+ install -m 444 /dev/null $LOCKFILE || {
|
|
230 |
+ log_error "Could not create lock ${LOCKFILE}"
|
|
231 |
+ laststeps 2
|
|
232 |
+ }
|
|
233 |
+ fi
|
|
234 |
+ |
|
226 | 235 |
# Get filehandle
|
227 | 236 |
local randomstring
|
228 |
- exec {randomstring}<>${LOCKFILE}
|
|
237 |
+ exec {randomstring}<${LOCKFILE}
|
|
229 | 238 |
# Store filehandle for later
|
230 | 239 |
LOCKFD[${LOCK}]=${randomstring}
|
231 | 240 |
|
... | ... | @@ -728,7 +728,7 @@ def do_pkg(upload, session): |
728 | 728 |
print "PENDING %s\n" % handler.get_action()
|
729 | 729 |
return
|
730 | 730 |
|
731 |
- do_new(upload, upload_copy, handler, session)
|
|
731 |
+ do_new(upload, upload_copy, handler, session)
|
|
732 | 732 |
except AlreadyLockedError as e:
|
733 | 733 |
print "Seems to be locked by %s already, skipping..." % (e)
|
734 | 734 |
|