From: Leo Nunner <l.nunner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager] fix #4481: fetch changelogs for any Proxmox repository
Date: Mon, 30 Jan 2023 11:59:53 +0100 [thread overview]
Message-ID: <20230130105953.126483-1-l.nunner@proxmox.com> (raw)
This patch fixes the issue that when the user supplied any non-standard
repositories, the changelogs often wouldn't load. For example, providing
both pve-no-subscription and pbs-no-subscription broke the changelog
API, since the URL built for pbs-no-subscription was invalid.
Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
---
Changes from v1:
- Directly pass $pkgfile to get_changelog_url
- Only check enabled repositories
- Compare the site of the package with the repository URL
PVE/API2/APT.pm | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index 09c76545..c4e2bb3d 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -89,11 +89,16 @@ my $get_pkgfile = sub {
};
my $get_changelog_url =sub {
- my ($pkgname, $info, $pkgver, $origin, $component) = @_;
+ my ($pkgname, $info, $pkgver, $pkgfile) = @_;
my $changelog_url;
my $base;
$base = dirname($info->{FileName}) if defined($info->{FileName});
+
+ my $origin = $pkgfile->{Origin};
+ my $component = $pkgfile->{Component};
+ my $site = $pkgfile->{Site};
+
if ($origin && $base) {
$pkgver =~ s/^\d+://; # strip epoch
my $srcpkg = $info->{SourcePkg} || $pkgname;
@@ -101,10 +106,19 @@ my $get_changelog_url =sub {
$base =~ s!pool/updates/!pool/!; # for security channel
$changelog_url = "http://packages.debian.org/changelogs/$base/${srcpkg}_${pkgver}/changelog";
} elsif ($origin eq 'Proxmox') {
- if ($component eq 'pve-enterprise') {
- $changelog_url = "https://enterprise.proxmox.com/debian/$base/${pkgname}_${pkgver}.changelog";
- } else {
- $changelog_url = "http://download.proxmox.com/debian/$base/${pkgname}_${pkgver}.changelog";
+ my $data = Proxmox::RS::APT::Repositories::repositories("pve");
+
+ for my $file ($data->{files}->@*) {
+ for my $repo ($file->{repositories}->@*) {
+ if (
+ $repo->{Enabled}
+ && grep(/$component/, $repo->{Components}->@*)
+ && $repo->{URIs}[0] =~ m/$site/
+ ) {
+ $changelog_url = $repo->{URIs}[0] . "/$base/${pkgname}_${pkgver}.changelog";
+ last;
+ }
+ }
}
}
}
@@ -124,7 +138,7 @@ my $assemble_pkginfo = sub {
if (my $pkgfile = &$get_pkgfile($candidate_ver)) {
$data->{Origin} = $pkgfile->{Origin};
my $changelog_url = $get_changelog_url->(
- $pkgname, $info, $candidate_ver->{VerStr}, $pkgfile->{Origin}, $pkgfile->{Component});
+ $pkgname, $info, $candidate_ver->{VerStr}, $pkgfile);
$data->{ChangeLogUrl} = $changelog_url if $changelog_url;
}
@@ -431,7 +445,7 @@ __PACKAGE__->register_method({
my $url;
die "changelog for '${pkgname}_$ver->{VerStr}' not available\n"
- if !($pkgfile && ($url = &$get_changelog_url($pkgname, $info, $ver->{VerStr}, $pkgfile->{Origin}, $pkgfile->{Component})));
+ if !($pkgfile && ($url = &$get_changelog_url($pkgname, $info, $ver->{VerStr}, $pkgfile)));
my $data = "";
--
2.30.2
next reply other threads:[~2023-01-30 11:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 10:59 Leo Nunner [this message]
2023-02-01 9:15 ` Thomas Lamprecht
2023-02-01 11:38 ` [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=20230130105953.126483-1-l.nunner@proxmox.com \
--to=l.nunner@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