diff options
| author | Loïc Minier <lool@dooz.org> | 2010-01-30 00:29:50 +0100 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2010-01-30 00:29:50 +0100 |
| commit | ac445efb09f86a807a7dd965c88d2784e5642375 (patch) | |
| tree | 96c23579bcd7d779e6301b6edabcef30c86e9ade | |
| parent | ec1b1c3bcfedf8b9185347202bc706eca3e1f977 (diff) | |
| download | pbuilder-ac445efb09f86a807a7dd965c88d2784e5642375.tar pbuilder-ac445efb09f86a807a7dd965c88d2784e5642375.tar.gz | |
Add support for *-proposed-updates/volatile
| -rwxr-xr-x | pbuilder-apt-config | 12 | ||||
| -rwxr-xr-x | test_pbuilder-apt-config | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pbuilder-apt-config b/pbuilder-apt-config index ff9c19c..af28c75 100755 --- a/pbuilder-apt-config +++ b/pbuilder-apt-config @@ -251,13 +251,21 @@ if [ -n "$profile" ]; then add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$base_mirror" "$profile" "$components" ;; + *-proposed-updates/volatile) + archive="debian-volatile" + mirror="`get_archive_url "$archive"`" + volatile_dist="$base_dist/volatile" + add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" + add_output_sources "$with_sources" "$mirror" "$volatile_dist" "$components" + add_output_sources "$with_sources" "$mirror" "$profile" "$components" + ;; */volatile|*/volatile-sloppy) if [ "$base_dist" != "${profile%%/*}" ]; then - die "Unknown Volatile based profile=$profile" + die "Unknown Debian Volatile based profile=$profile" fi archive="debian-volatile" mirror="`get_archive_url "$archive"`" - volatile_dist=${profile%%-*} + volatile_dist=${profile%-sloppy} add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$mirror" "$volatile_dist" "$components" if [ "$volatile_dist" != "$profile" ]; then diff --git a/test_pbuilder-apt-config b/test_pbuilder-apt-config index b90aea8..4f03919 100755 --- a/test_pbuilder-apt-config +++ b/test_pbuilder-apt-config @@ -91,6 +91,9 @@ deb squeeze/volatile comp1" test_profile squeeze/volatile expect_output "deb squeeze comp1 deb squeeze/volatile comp1 deb squeeze/volatile-sloppy comp1" test_profile squeeze/volatile-sloppy +expect_output "deb squeeze comp1 +deb squeeze/volatile comp1 +deb squeeze-proposed-updates/volatile comp1" test_profile squeeze-proposed-updates/volatile expect_output "deb bo comp1" test_profile bo expect_output "deb lucid comp1" test_profile lucid |