diff --git a/debian/changelog b/debian/changelog index fe7f84d..e0691eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ubuntu-dev-tools (0.136) UNRELEASED; urgency=low (LP: #881967) * requestsync: Make --lp the default. * submittodebian: Use prettier patch filenames (LP: #887333) + * mk-sbuild: Allow creating experimental chroots again (LP: #885499) -- Stefano Rivera Sat, 12 Nov 2011 23:28:05 +0200 diff --git a/mk-sbuild b/mk-sbuild index 46f37d5..9eee010 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -236,7 +236,12 @@ fi # Determine distribution and possible synonyms synonym="" EXPERIMENTAL=0 -if debian-distro-info --all | grep -Fqx "$RELEASE"; then +if [ "$RELEASE" = "experimental" ]; then + DISTRO="${DISTRO:-debian}" + EXPERIMENTAL=1 + name="${name:-experimental}" + RELEASE=$(debian-distro-info --devel) +elif debian-distro-info --all | grep -Fqx "$RELEASE"; then DISTRO="${DISTRO:-debian}" if [ "$RELEASE" = $(debian-distro-info --devel) ]; then synonym=unstable @@ -265,11 +270,6 @@ elif [ "$RELEASE" = "oldstable" ]; then DISTRO="${DISTRO:-debian}" synonym="$RELEASE" RELEASE=$(debian-distro-info --old) -elif [ "$RELEASE" = "experimental" ]; then - DISTRO="${DISTRO:-debian}" - EXPERIMENTAL=1 - name="${name:-experimental}" - RELEASE=$(debian-distro-info --devel) elif [ -z "$DISTRO" ]; then echo "Unable to determine distribution, please provide --distro" >&2 exit 1