mk-sbuild: Allow creating experimental chroots again (LP: #885499)

This commit is contained in:
Stefano Rivera 2011-11-13 00:40:26 +02:00
parent 12b5dfd4da
commit 390d6f5a8d
2 changed files with 7 additions and 6 deletions

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ ubuntu-dev-tools (0.136) UNRELEASED; urgency=low
(LP: #881967) (LP: #881967)
* requestsync: Make --lp the default. * requestsync: Make --lp the default.
* submittodebian: Use prettier patch filenames (LP: #887333) * submittodebian: Use prettier patch filenames (LP: #887333)
* mk-sbuild: Allow creating experimental chroots again (LP: #885499)
-- Stefano Rivera <stefanor@debian.org> Sat, 12 Nov 2011 23:28:05 +0200 -- Stefano Rivera <stefanor@debian.org> Sat, 12 Nov 2011 23:28:05 +0200

View File

@ -236,7 +236,12 @@ fi
# Determine distribution and possible synonyms # Determine distribution and possible synonyms
synonym="" synonym=""
EXPERIMENTAL=0 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}" DISTRO="${DISTRO:-debian}"
if [ "$RELEASE" = $(debian-distro-info --devel) ]; then if [ "$RELEASE" = $(debian-distro-info --devel) ]; then
synonym=unstable synonym=unstable
@ -265,11 +270,6 @@ elif [ "$RELEASE" = "oldstable" ]; then
DISTRO="${DISTRO:-debian}" DISTRO="${DISTRO:-debian}"
synonym="$RELEASE" synonym="$RELEASE"
RELEASE=$(debian-distro-info --old) 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 elif [ -z "$DISTRO" ]; then
echo "Unable to determine distribution, please provide --distro" >&2 echo "Unable to determine distribution, please provide --distro" >&2
exit 1 exit 1