diff options
| author | Loïc Minier <lool@dooz.org> | 2010-01-30 11:38:50 +0100 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2010-01-30 11:38:50 +0100 |
| commit | 3483d38fb43761ac8ead2c5a5caa1770249fe035 (patch) | |
| tree | 15e4d918701f6fd12f971594e8ddd2ee113c9697 | |
| parent | 804679d1eda4ee1a8f95e70687435f3750fc7190 (diff) | |
| download | pbuilder-3483d38fb43761ac8ead2c5a5caa1770249fe035.tar pbuilder-3483d38fb43761ac8ead2c5a5caa1770249fe035.tar.gz | |
Add Debian Security support
| -rwxr-xr-x | pbuilder-apt-config | 15 | ||||
| -rwxr-xr-x | test_pbuilder-apt-config | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pbuilder-apt-config b/pbuilder-apt-config index 74b5a55..bc21137 100755 --- a/pbuilder-apt-config +++ b/pbuilder-apt-config @@ -7,7 +7,6 @@ self="$(basename "$0")" # TODO # - support setting --mirror-map (for --profile) -# - Debian security entries? log() { echo "$@" >&2 @@ -90,6 +89,9 @@ get_archive_url() { ubuntu-ports) echo "http://ports.ubuntu.com/ubuntu-ports/" ;; + debian-security) + echo "http://security.debian.org/" + ;; debian-volatile) echo "http://volatile.debian.org/debian-volatile/" ;; @@ -298,9 +300,18 @@ if [ -n "$profile" ]; then add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$mirror" "$profile" "$components" ;; + */updates) + if [ "$base_dist" != "${profile%%/*}" ]; then + die "Unknown Debian Security based profile=$profile" + fi + archive="debian-security" + mirror="`get_archive_url "$archive"`" + add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" + add_output_sources "$with_sources" "$mirror" "$profile" "$components" + ;; *-proposed-updates) if [ "$base_dist" != "${profile%%-*}" ]; then - die "Unknown Debian updates based profile=$profile" + die "Unknown Debian Updates based profile=$profile" fi add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$base_mirror" "$profile" "$components" diff --git a/test_pbuilder-apt-config b/test_pbuilder-apt-config index 0f94ef2..17ccf79 100755 --- a/test_pbuilder-apt-config +++ b/test_pbuilder-apt-config @@ -83,6 +83,8 @@ expect_output "deb sid comp1" test_profile sid expect_output "deb unstable comp1 deb experimental comp1" test_profile experimental expect_output "deb squeeze comp1 +deb squeeze/updates comp1" test_profile squeeze/updates +expect_output "deb squeeze comp1 deb squeeze-proposed-updates comp1" test_profile squeeze-proposed-updates expect_output "deb squeeze comp1 deb squeeze-backports comp1" test_profile squeeze-backports |