josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

Fix support for apt-transport-mirror URLs #8

Closed
boklm wants to merge 2 commits from boklm/mmdebstrap:fix_apt-transport-mirror into main
pull from: boklm/mmdebstrap:fix_apt-transport-mirror
merge into: josch:main
Conversation 3 Commits 2 Files changed 1 +10 -3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mmdebstrap
View file

@ -2865,7 +2865,7 @@ sub run_install() {
'--format', '$(URI)', 'Created-By: Packages') '--format', '$(URI)', 'Created-By: Packages')
or error "cannot start apt-get indextargets: $!"; or error "cannot start apt-get indextargets: $!";
while (my $uri = <$pipe_apt>) { while (my $uri = <$pipe_apt>) {
if ($uri =~ /^https:\/\//) { if ($uri =~ /^(mirror\+)?https:\/\//) {
info "https mirror found -- adding apt-transport-https " info "https mirror found -- adding apt-transport-https "
. "and ca-certificates"; . "and ca-certificates";
# FIXME: support for https is part of apt >= 1.5 # FIXME: support for https is part of apt >= 1.5
@ -3081,8 +3081,15 @@ sub run_cleanup() {
# apt since 1.6 creates the auxfiles directory. If apt inside the # apt since 1.6 creates the auxfiles directory. If apt inside the
# chroot is older than that, then it will not know how to clean it. # chroot is older than that, then it will not know how to clean it.
if (-e "$options->{root}/var/lib/apt/lists/auxfiles") { if (-e "$options->{root}/var/lib/apt/lists/auxfiles") {
rmdir "$options->{root}/var/lib/apt/lists/auxfiles" remove_tree("$options->{root}/var/lib/apt/lists/auxfiles",
or die "cannot rmdir /var/lib/apt/lists/auxfiles: $!"; { error => \my $err });
if (@$err) {
for my $diag (@$err) {
my ($file, $message) = %$diag;
if ($file eq '') { warning "general error: $message"; }
else { warning "problem unlinking $file: $message"; }
}
}
} }
} }