From 391e9c7f07060611b9f8a39f34832bb27c353db0 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Sun, 13 Nov 2011 00:40:58 +0200
Subject: [PATCH] experimental shouldn't be the default in experimental
 chroots.

---
 debian/changelog | 1 +
 mk-sbuild        | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0691eb..69a4dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ubuntu-dev-tools (0.136) UNRELEASED; urgency=low
   * requestsync: Make --lp the default.
   * submittodebian: Use prettier patch filenames (LP: #887333)
   * mk-sbuild: Allow creating experimental chroots again (LP: #885499)
+  * experimental shouldn't be the default in experimental chroots.
 
  -- Stefano Rivera <stefanor@debian.org>  Sat, 12 Nov 2011 23:28:05 +0200
 
diff --git a/mk-sbuild b/mk-sbuild
index 9eee010..6723254 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -557,11 +557,6 @@ cat "$TEMP_SOURCES" | sed -e "s|RELEASE|$RELEASE|g" | \
     sudo bash -c "cat > $MNT/etc/apt/sources.list"
 rm -f "$TEMP_SOURCES"
 
-if [ "$EXPERIMENTAL" -eq 1 ]; then
-    echo 'APT::Default-Release "experimental";' \
-        | sudo tee "$MNT"/etc/apt/apt.conf.d/15sbuild > /dev/null
-fi
-
 # Copy the timezone (comment this out if you want to leave the chroot at UTC)
 sudo cp /etc/localtime /etc/timezone "$MNT"/etc/
 # Create a schroot entry for this chroot