From 05f5ce10c8e9a08a8497aa41274caaf0cc0ea309 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sun, 24 Apr 2011 21:53:50 +0200 Subject: [PATCH] Revert r1082, I was being an idiot --- debian/changelog | 1 - mk-sbuild | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82f73a5..bae94ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,6 @@ ubuntu-dev-tools (0.124) UNRELEASED; urgency=low - Determine distribution from release name (via distro-info). - Reformat manpage. - Install qemu-user-static instead of qemu-kvm-extras-static. - - Correctly substitute release into security suite name. - Put schroot configuration in chroot.d/sbuild-$chroot (LP: #736808) - Understand Debian distribution synonyms, and store the chroot under the code name. diff --git a/mk-sbuild b/mk-sbuild index 3f4e946..741b6aa 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -388,7 +388,7 @@ ubuntu) COMPONENTS="main restricted universe multiverse" fi if [ -z "$SOURCES_SECURITY_SUITE" ]; then - SOURCES_SECURITY_SUITE="${RELEASE}-security" + SOURCES_SECURITY_SUITE="RELEASE-security" fi if [ -z "$SOURCES_SECURITY_URL" ]; then case "$CHROOT_ARCH" in @@ -425,7 +425,7 @@ debian) # Debian only performs security updates SKIP_UPDATES=1 if [ -z "$SOURCES_SECURITY_SUITE" ]; then - SOURCES_SECURITY_SUITE="$RELEASE/updates" + SOURCES_SECURITY_SUITE="RELEASE/updates" fi if [ -z "$SOURCES_SECURITY_URL" ]; then SOURCES_SECURITY_URL="http://security.debian.org/"