fix lock behavior for cowbuilder chroot handling

kakwa · Jul 25, 2017 · df2572e · df2572e
1 parent 03d45b3
commit df2572e
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/common/buildenv/Makefile.common b/common/buildenv/Makefile.common
@@ -182,14 +182,17 @@ $(BUILD_DIR)/pkg_built_chroot.deb.$(DIST): $(DEB_PREPARE) | $(DIRECTORIES)
 	cowbuilder --help >/dev/null
 	cd $(BUILD_DIR)/deb.$(DIST)/$(PKGNAME)-$(VERSION) && \
 	     dpkg-source -b ./
-	if ! [ -e $(COW_DIR)/$(COW_NAME) ] && ! [ "$(SKIP_COWBUILDER_SETUP)" = "true" ];\
-	then\
-	    export TMPDIR=/tmp/; flock -x /tmp/cowbuilder.$(DIST).lock -c '$(COW_SUDO) cowbuilder create --debootstrap debootstrap $(COW_DIST) $(OTHERMIRROR) --basepath $(COW_DIR)/$(COW_NAME) --mirror $(DEB_MIRROR) $(BINDMOUNT)'; ret=$$?;\
-	elif ! [ "$(SKIP_COWBUILDER_SETUP)" = "true" ];\
-		then\
-	    export TMPDIR=/tmp/; flock -x /tmp/cowbuilder.$(DIST).lock -c '$(COW_SUDO) cowbuilder update --basepath $(COW_DIR)/$(COW_NAME) $(BINDMOUNT)'; ret=$$?;\
-	fi;\
-	exit $$ret
+	if ! [ "$(SKIP_COWBUILDER_SETUP)" = "true" ];then\
+	    flock -x /tmp/cowbuilder.$(DIST).lock -c 'if ! [ -e $(COW_DIR)/$(COW_NAME) ];\
+	    then\
+	        export TMPDIR=/tmp/;$(COW_SUDO) cowbuilder create --debootstrap\
+	       		debootstrap $(COW_DIST) $(OTHERMIRROR) --basepath $(COW_DIR)/$(COW_NAME) \
+			--mirror $(DEB_MIRROR) $(BINDMOUNT); ret=$$?;\
+	    else\
+	        export TMPDIR=/tmp/; $(COW_SUDO) cowbuilder update \
+		--basepath $(COW_DIR)/$(COW_NAME) $(BINDMOUNT); ret=$$?;\
+	    fi ; exit $$ret;';\
+	fi
 	export TMPDIR=/tmp/; $(COW_SUDO) cowbuilder build $(BUILD_DIR)/deb.$(DIST)/*.dsc  --basepath $(COW_DIR)/$(COW_NAME) --buildresult $(OUT_DIR)/ $(OTHERMIRROR) --mirror $(DEB_MIRROR) $(BINDMOUNT); \
 	if [ $$? -ne 0 ];\
 		then touch $(BUILD_DIR)/failure.chroot.$(DIST);exit 1;\