locks: tidy lock acquisition

Combine the check+create done in each script. (The original functions
are still callable as before, but a new combined `Aquire_lockfile`
function can be called instead, as now used).

Note, a further simplification could be done in removing the passing of
the lock filename in as a parameter since every use of the functions is
with ".lock". The lock functions already have a fallback to ".build/lock"
though. Checking the history, the fallback used to be for a system wide
lock, which was then replaced with this config-tree specific one. As long
as that is not used implicitly by 3rd-party hooks then surely we are free
to change the fallback to ".lock" and further remove passing in a name as
a param...?

history:
db5d2b0dcdae96e712661605e17bc9875e224f9f
0aa8289a3773fd8a3885090b72622c2f95ab099c

Gbp-Dch: Short
Closes: #952918

1 files changed, 4 insertions, 10 deletions

diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
index 424d05336..2fbd58391 100755
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -31,11 +31,8 @@ case "${1}" in
 		# Checking stage file
 		Check_stagefile .build/chroot_apt
 
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
+		# Aquire lock file
+		Acquire_lockfile
 
 		mkdir -p chroot/etc/apt/apt.conf.d
 
@@ -214,11 +211,8 @@ EOF
 	remove)
 		Echo_message "Deconfiguring file /etc/apt/apt.conf"
 
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
+		# Aquire lock file
+		Acquire_lockfile
 
 		# Deconfiguring aptitude ftp proxy
 		rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy