From: Daniel Martí Date: Mon, 27 Jan 2014 23:00:34 +0000 (+0100) Subject: fd-commit support for disabled updates X-Git-Tag: 0.2~342^2~4 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=778b15322cf868e68e8ab73eaf9235238e68454f;p=fdroidserver.git fd-commit support for disabled updates Also fix support for replacement builds --- diff --git a/fd-commit b/fd-commit index e64486a1..d80f6b5d 100755 --- a/fd-commit +++ b/fd-commit @@ -60,19 +60,31 @@ while read line; do fullname="$id" fi + onlybuild=true newbuild=false while read l; do - if [[ "$l" == "+Build:"* ]]; then + if [[ "$l" == "-Build:"* ]]; then + onlybuild=false + elif [[ "$l" == "+Build:"* ]]; then + if $newbuild; then + onlybuild=false + fi newbuild=true build=${l#*:} version=${build%%,*} build=${build#*,} vercode=${build%%,*} + elif $newbuild && $onlybuild [[ "$l" == "+"*"disable="* ]]; then + disable=true fi done < <(git diff HEAD -- "$file") - if $newbuild ; then - message="Update $fullname to $version ($vercode)" + if $newbuild && $onlybuild; then + if $disable; then + message="Don't update $fullname to $version ($vercode)" + else + message="Update $fullname to $version ($vercode)" + fi else message="$fullname:" fi