From 1d21bb96c9705210d39cacaa037bab14bb70e208 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 1 Feb 2019 13:51:55 +0100
Subject: bin/build-packages: do not try to un-flock if no flock was acquired
 due to -l

---
 bin/build-packages | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'bin/build-packages')

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
-- 
cgit v1.2.3-54-g00ecf