diff options
| -rwxr-xr-x | pbuilder-apt-config | 15 | ||||
| -rwxr-xr-x | test_pbuilder-apt-config | 9 |
2 files changed, 16 insertions, 8 deletions
diff --git a/pbuilder-apt-config b/pbuilder-apt-config index 6e49ded..0b1fa6f 100755 --- a/pbuilder-apt-config +++ b/pbuilder-apt-config @@ -11,7 +11,7 @@ self="$(basename "$0")" # - default output when neither --suite nor --profile is set? # - support getting/setting --archive? # - support setting --mirror-map (for --profile) -# - list Ubuntu security pocket? Debian security entries? +# - Debian security entries? log() { echo "$@" >&2 @@ -258,14 +258,17 @@ if [ -n "$profile" ]; then fi pockets="" case "$profile" in + *-security) + pockets="security" + ;; + *-updates) + pockets="security updates" + ;; *-backports) - pockets="updates backports" + pockets="security updates backports" ;; *-proposed) - pockets="updates proposed" - ;; - *-updates) - pockets="updates" + pockets="security updates proposed" ;; *) if [ "$base_dist" != "$profile" ]; then diff --git a/test_pbuilder-apt-config b/test_pbuilder-apt-config index 3f86bfc..1978d80 100755 --- a/test_pbuilder-apt-config +++ b/test_pbuilder-apt-config @@ -86,13 +86,18 @@ deb squeeze/volatile-sloppy comp1" test_profile squeeze/volatile-sloppy expect_output "deb lucid comp1" test_profile lucid expect_output "deb lucid comp1 +deb lucid-security comp1" test_profile lucid-security +expect_output "deb lucid comp1 +deb lucid-security comp1 +deb lucid-updates comp1" test_profile lucid-updates +expect_output "deb lucid comp1 +deb lucid-security comp1 deb lucid-updates comp1 deb lucid-backports comp1" test_profile lucid-backports expect_output "deb lucid comp1 +deb lucid-security comp1 deb lucid-updates comp1 deb lucid-proposed comp1" test_profile lucid-proposed -expect_output "deb lucid comp1 -deb lucid-updates comp1" test_profile lucid-updates expect_output "deb mirror suite component deb-src mirror suite component" run_suite_mode --with-sources=yes |