diff options
-rwxr-xr-x | pbuilder-apt-config | 12 | ||||
-rwxr-xr-x | test_pbuilder-apt-config | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pbuilder-apt-config b/pbuilder-apt-config index affed8a..74b5a55 100755 --- a/pbuilder-apt-config +++ b/pbuilder-apt-config @@ -61,6 +61,7 @@ guess_dist_arch_archive() { get_archive_url() { local archive="$1" + local people_ppa case "$archive" in backports.org) @@ -72,6 +73,17 @@ get_archive_url() { debian-archive) echo "http://archive.debian.org/debian/" ;; + ppa:*) + people_ppa="${archive#ppa:}" + case "$people_ppa" in + */*) + : + ;; + *) + people_ppa="$people_ppa/ppa" + esac + echo "http://ppa.launchpad.net/$people_ppa/ubuntu/" + ;; ubuntu) echo "http://archive.ubuntu.com/ubuntu/" ;; diff --git a/test_pbuilder-apt-config b/test_pbuilder-apt-config index 0a65c17..0f94ef2 100755 --- a/test_pbuilder-apt-config +++ b/test_pbuilder-apt-config @@ -125,6 +125,8 @@ expect_fail run_suite_mode --arch armel --mirror "" --archive archive expect_success run_suite_mode --mirror "" --suite lucid expect_fail run_suite_mode --mirror "" --suite suite expect_success run_suite_mode --mirror "" --suite suite --archive ubuntu +expect_output "deb http://ppa.launchpad.net/people/ppa/ubuntu/ suite component" run_suite_mode --mirror "" --suite suite --archive ppa:people +expect_output "deb http://ppa.launchpad.net/people/otherppa/ubuntu/ suite component" run_suite_mode --mirror "" --suite suite --archive ppa:people/otherppa expect_output "suite" debootstrap_suite --suite suite expect_output "sid" debootstrap_suite --suite sid |