From 0b7188ce3265d70300eaf84a25ac033dbe64313a Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 16 Jan 2023 07:54:27 +0100 Subject: [PATCH] be more verbose when 'apt-get update' failed --- mmdebstrap | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/mmdebstrap b/mmdebstrap index 74449ad..0890302 100755 --- a/mmdebstrap +++ b/mmdebstrap @@ -2298,11 +2298,33 @@ sub run_update() { ); close $fh; if ($indextargets eq '') { - if ($verbosity_level >= 1) { - 0 == system('apt-cache', 'policy') - or error "apt-cache failed: $?"; + warning("apt-get indextargets output is empty"); + for my $list (@{ $options->{sourceslists} }) { + if (defined $list->{fname}) { + info("Filename: $list->{fname}"); + } + info("Type: $list->{type}"); + info("Content:"); + for my $line (split "\n", $list->{content}) { + info(" $line"); + } + } + open(my $fh, '-|', 'apt-cache', 'policy') + // error "failed to fork(): $!"; + while (my $line = <$fh>) { + chomp $line; + info $line; + } + close $fh; + my $msg + = "apt-get update did not find any indices " + . "for architecture '$options->{nativearch}' in "; + if (length $options->{suite}) { + $msg .= "suite '$options->{suite}'"; + } else { + $msg .= "the configured apt sources"; } - error "apt-get update didn't download anything"; + error $msg; } }