From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8FB9B76103 for ; Wed, 14 Jul 2021 16:50:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84E5113410 for ; Wed, 14 Jul 2021 16:49:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0B5B813407 for ; Wed, 14 Jul 2021 16:49:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D10C941055 for ; Wed, 14 Jul 2021 16:49:37 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Wed, 14 Jul 2021 16:49:25 +0200 Message-Id: <20210714144925.2861984-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.450 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH] try all available compressors for Packages X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 14:50:08 -0000 Some repositories (e.g. debian-security) only offer .xz compressed Packages, others (e.g. promox repositories) only .gz compressed ones. Make the compressors an array and try them in order until successful Signed-off-by: Stoiko Ivanov --- Note: best viewed with `-w` Was not too sure about the comment on it being hacky - but it seems ok to me this way (I think this is what apt does as well?) DAB.pm | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/DAB.pm b/DAB.pm index 26db7ad..c540237 100644 --- a/DAB.pm +++ b/DAB.pm @@ -618,17 +618,16 @@ sub initialize { my $logfd = $self->{logfd} = IO::File->new (">$self->{logfile}") || die "unable to open log file"; - # FIXME: seems a bit like a hacky way?? - my $COMPRESSOR = { - ext => 'gz', - decomp => 'gzip -d', - }; - if ($self->{config}->{suite} eq 'bullseye') { - $COMPRESSOR = { + my $COMPRESSORS = [ + { ext => 'xz', decomp => 'xz -d', - }; - } + }, + { + ext => 'gz', + decomp => 'gzip -d', + }, + ]; foreach my $ss (@{$self->{sources}}) { my $src = $ss->{mirror} || $ss->{source}; @@ -645,12 +644,21 @@ sub initialize { warn "Release info ignored\n"; }; - foreach my $comp (@{$ss->{comp}}) { - $path = "dists/$ss->{suite}/$comp/binary-$arch/Packages.$COMPRESSOR->{ext}"; - $target = "$infodir/" . __url_to_filename ("$ss->{source}/$path"); - my $pkgsrc = "$src/$path"; - $self->download ($pkgsrc, $target); - $self->run_command ("$COMPRESSOR->{decomp} '$target'"); + foreach my $compressor (@$COMPRESSORS) { + foreach my $comp (@{$ss->{comp}}) { + $path = "dists/$ss->{suite}/$comp/binary-$arch/Packages.$compressor->{ext}"; + $target = "$infodir/" . __url_to_filename ("$ss->{source}/$path"); + my $pkgsrc = "$src/$path"; + eval { + $self->download ($pkgsrc, $target); + $self->run_command ("$compressor->{decomp} '$target'"); + }; + if (my $err = $@) { + print $logfd "could not download Packages.$compressor->{ext}\n"; + } else { + last; + } + } } } } -- 2.30.2