diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-20 22:08:07 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-20 22:08:07 -0400 |
| commit | cc0034ce01741e7f3de2fd681144846df6b3fc66 (patch) | |
| tree | 55288fde19b410aa14c19282d2d7eedd219fff93 | |
| parent | bec95eeaee02dffb0f1750b9ca2641378bbe9df9 (diff) | |
Move the staging lock file descriptor from 10 to 8. >=10 isn't safe.
| -rwxr-xr-x | src/abslibre-tools/librerelease | 8 | ||||
| -rwxr-xr-x | src/abslibre-tools/librestage | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index e3869e9..fc1ab11 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -187,14 +187,14 @@ pretty_print_packages() { } clean() { - lock 10 "${WORKDIR}/staging.lock" \ + lock 8 "${WORKDIR}/staging.lock" \ 'Waiting for an exclusive lock on the staging directory' local file_list="$(mktemp -t ${0##*/}.XXXXXXXXXX)" trap "$(printf 'rm -f -- %q' "$file_list")" EXIT list0_files > "$file_list" - lock_close 10 + lock_close 8 clean_files "$file_list" } @@ -206,7 +206,7 @@ release_packages() { bash -c "${HOOKPRERELEASE}" fi - lock 10 "${WORKDIR}/staging.lock" \ + lock 8 "${WORKDIR}/staging.lock" \ 'Waiting for an exclusive lock on the staging directory' sign_packages || return 1 @@ -221,7 +221,7 @@ release_packages() { trap "$(printf 'rm -f -- %q' "$file_list")" EXIT list0_files > "$file_list" - lock_close 10 + lock_close 8 msg "%s to upload" "$(cd "${WORKDIR}/staging" && du -hc --files0-from="$file_list" | sed -n '$s/\t.*//p')" msg "Uploading packages..." diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 1bfb200..8ea3b53 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -75,7 +75,7 @@ main() { # Now for the main routine. staged=false - slock 10 "${WORKDIR}/staging.lock" \ + slock 8 "${WORKDIR}/staging.lock" \ 'Waiting for a shared lock on the staging directory' for CARCH in "${ARCHES[@]}" any; do for _pkgname in "${pkgname[@]}"; do |