[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
> @@ -899,6 +906,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" | \

good point, removing.

> +        sudo bash -c "cat > $MNT/etc/apt/preferences.d/proposed.pref"
> +    rm -f "$TEMP_PREFERENCES"
> +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.