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

[Dimitri John Ledkov]

Diff comments:

> diff --git a/mk-sbuild b/mk-sbuild
> index e280fbb..40f673f 100755
> --- a/mk-sbuild
> +++ b/mk-sbuild
> @@ -858,6 +858,13 @@ EOM
>          fi
>      fi
>      if [ -z "$SKIP_PROPOSED" ]; then
> +	TEMP_PREFERENCES=`mktemp -t preferences-XXXXXX`
> +        cat >> "$TEMP_PREFERENCES" <<EOM
> +# override for NotAutomatic: yes
> +Package: *
> +Pin: release a=$SOURCES_PROPOSED_SUITE
> +Pin-Priority: 990

I agree with bdrung here, it should be 500, just like it is in launchpad-buildd 

https://git.launchpad.net/launchpad-buildd/tree/lpbuildd/target/apt.py#n60

> +EOM
>          cat >> "$TEMP_SOURCES" <<EOM
>  deb ${MIRROR_ARCHS}${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}
>  deb-src ${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}
> @@ -883,6 +890,11 @@ fi
>  cat "$TEMP_SOURCES" | sed -e "s|RELEASE|$RELEASE|g" | \
>      sudo bash -c "cat > $MNT/etc/apt/sources.list"
>  rm -f "$TEMP_SOURCES"
> +if [ -n "$TEMP_PREFERENCES" ]; then
> +    sed -e "s|RELEASE|$RELEASE|g" < "$TEMP_PREFERENCES" | \
> +        sudo bash -c "cat > $MNT/etc/apt/preferences"
> +    rm -f "$TEMP_PREFERENCES"

I would prefer to use /etc/apt/prefrences.d/{pocket}.pref file just like launchapud-buildd does https://git.launchpad.net/launchpad-buildd/tree/lpbuildd/target/apt.py#n60

> +fi
>  
>  # Copy the timezone (comment this out if you want to leave the chroot at UTC)
>  sudo cp -P --remove-destination /etc/localtime /etc/timezone "$MNT"/etc/


-- 
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.