git show d265997c: buildall: avoid repeated building containers in sparrow
git show 67ad8b6e: sparrow/4-docker/buildall: prevent duplicate build
[why] delete one of the preceding patches because the two patches have the same functions.
Signed-off-by: Liu Yinsi liuyinsi@163.com --- sparrow/4-docker/buildall | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 727abb9..c838f86 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -25,7 +25,6 @@ do_one() local container=$1 local container_name=$(basename $container) lockfile-create -q --use-pid --retry 100 --lock-name "$container_name".lock - echo "$started_containers" | grep -w -q "$container_name" && return 0
log_info "start build $container." mkdir $tmpdir/$container_name 2>/dev/null && @@ -42,7 +41,6 @@ do_one() [ "$container_name" == 'initrd-lkp' ] && ./run ) log_info "finish build $container." - started_containers+="$container_name" lockfile-remove --lock-name "$container_name".lock }
Reviewed-by: Yu Chuan 13186087857@163.com
On Tue, Feb 02, 2021 at 08:51:52PM +0800, Liu Yinsi wrote:
git show d265997c: buildall: avoid repeated building containers in sparrow
git show 67ad8b6e: sparrow/4-docker/buildall: prevent duplicate build
[why] delete one of the preceding patches because the two patches have the same functions.
Signed-off-by: Liu Yinsi liuyinsi@163.com
sparrow/4-docker/buildall | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 727abb9..c838f86 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -25,7 +25,6 @@ do_one() local container=$1 local container_name=$(basename $container) lockfile-create -q --use-pid --retry 100 --lock-name "$container_name".lock
echo "$started_containers" | grep -w -q "$container_name" && return 0
log_info "start build $container." mkdir $tmpdir/$container_name 2>/dev/null &&
@@ -42,7 +41,6 @@ do_one() [ "$container_name" == 'initrd-lkp' ] && ./run ) log_info "finish build $container."
- started_containers+="$container_name" lockfile-remove --lock-name "$container_name".lock
}
-- 2.23.0