[Merge] ubuntu-dev-tools:mk-sbuild-not-automatic into ubuntu-dev-tools:master

[Steve Langasek]

Diff comments:

> diff --git a/mk-sbuild b/mk-sbuild
> index 52e15a1..8f44419 100755
> --- a/mk-sbuild
> +++ b/mk-sbuild
> @@ -874,6 +874,13 @@ EOM
>          fi
>      fi
>      if [ -z "$SKIP_PROPOSED" ]; then
> +	TEMP_PREFERENCES=`mktemp -t preferences-XXXXXX`

shellcheck can die in a fire

> +        cat >> "$TEMP_PREFERENCES" <<EOM
> +# override for NotAutomatic: yes
> +Package: *
> +Pin: release a=*-proposed
> +Pin-Priority: 500
> +EOM
>          cat >> "$TEMP_SOURCES" <<EOM
>  deb ${MIRROR_ARCHS}${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}
>  deb-src ${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}


-- 
https://code.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/433158
Your team Ubuntu Development Team is subscribed to branch ubuntu-dev-tools:master.