diff options
| author | Erich Eckner <git@eckner.net> | 2019-02-01 13:51:55 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-02-01 13:51:55 +0100 |
| commit | 1d21bb96c9705210d39cacaa037bab14bb70e208 (patch) | |
| tree | 0c021f422c4823a3eed47578d159b7b41663ca9e | |
| parent | bdbff0c368672779d8e59dec3eb31d1099ddc1d2 (diff) | |
| download | builder-1d21bb96c9705210d39cacaa037bab14bb70e208.tar.xz | |
bin/build-packages: do not try to un-flock if no flock was acquired due to -l
| -rwxr-xr-x | bin/build-packages | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/build-packages b/bin/build-packages index 6d69ac1..e32269d 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -328,7 +328,9 @@ while [ "${count}" -ne 0 ] && \ fi cd "${base_dir}" recursively_umount_and_rm "${tmp_dir}" - flock -u 9 || true + if [ -z "${forced_package}" ]; then + flock -u 9 || true + fi exit "${err}" } find "${work_dir}" \ @@ -357,7 +359,9 @@ while [ "${count}" -ne 0 ] && \ 'return-assignment' 'ABORT' recursively_umount_and_rm "${tmp_dir}" - flock -u 9 || true + if [ -z "${forced_package}" ]; then + flock -u 9 || true + fi trap - EXIT continue fi @@ -880,7 +884,9 @@ while [ "${count}" -ne 0 ] && \ # clean up tmp_dir cd "${base_dir}" recursively_umount_and_rm "${tmp_dir}" - flock -u 9 || true + if [ -z "${forced_package}" ]; then + flock -u 9 || true + fi trap - EXIT continue |