From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH] try all available compressors for Packages
Date: Wed, 14 Jul 2021 16:49:25 +0200 [thread overview]
Message-ID: <20210714144925.2861984-1-s.ivanov@proxmox.com> (raw)
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 <s.ivanov@proxmox.com>
---
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
next reply other threads:[~2021-07-14 14:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 14:49 Stoiko Ivanov [this message]
2021-07-14 15:29 ` Thomas Lamprecht
2021-07-14 15:37 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714144925.2861984-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox