From e4da9b9daf14e4e23d595b929b168a8368a430cd Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Mon, 4 May 2009 09:16:24 -0700 Subject: [PATCH] mk-sbuild-lv: skip security repo for Debian unstable, thanks to Ryan Niebur (LP: #371569). --- debian/changelog | 7 +++++++ mk-sbuild-lv | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8be40ff..45ab99d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.74) UNRELEASED; urgency=low + + * mk-sbuild-lv: skip security repo for Debian unstable, thanks to + Ryan Niebur (LP: #371569). + + -- Kees Cook Mon, 04 May 2009 09:11:42 -0700 + ubuntu-dev-tools (0.73) karmic; urgency=low [ Siegfried-Angel Gevatter Pujals ] diff --git a/mk-sbuild-lv b/mk-sbuild-lv index 425d694..01f7ab7 100755 --- a/mk-sbuild-lv +++ b/mk-sbuild-lv @@ -258,6 +258,10 @@ debian) if [ -z "$SOURCES_SECURITY_URL" ]; then SOURCES_SECURITY_URL="http://security.debian.org/" fi + # Unstable (aka "sid") does not have a security repository + if [ "$RELEASE" = 'unstable' ] || [ "$RELEASE" = 'sid' ]; then + SKIP_SECURITY=1 + fi ;; *) echo "Unknown --distro '$DISTRO': aborting" >&2 @@ -291,10 +295,12 @@ deb ${DEBOOTSTRAP_MIRROR} RELEASE-updates ${COMPONENTS} deb-src ${DEBOOTSTRAP_MIRROR} RELEASE-updates ${COMPONENTS} EOM fi - cat >> "$TEMP_SOURCES" <> "$TEMP_SOURCES" < $MNT/etc/apt/sources.list"