Re: [pve-devel] [PATCH manager] fix 4481: fetch changelogs for any Proxmox repository

[Thomas Lamprecht <t.lamprecht@proxmox.com>]

Am 27/01/2023 um 11:41 schrieb Fabian Grünbichler:
> On January 18, 2023 2:54 pm, Leo Nunner wrote:
>> 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>
>> ---
>>  PVE/API2/APT.pm | 13 +++++++++----
>>  1 file changed, 9 insertions(+), 4 deletions(-)
>>
>> diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
>> index 09c76545..921b55a1 100644
>> --- a/PVE/API2/APT.pm
>> +++ b/PVE/API2/APT.pm
>> @@ -101,10 +101,15 @@ 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 (join(" ", $repo->{Components}->@*) eq $component) {
> 
> a few improvements possible here:
> - it should be enough that one of the components matches (e.g., I could have
> pvetest and pve-no-subscription configured in a single entry)
> - this should only take enabled repositories into account
> - we should probably also compare the 'Site' member of $pkgfile toe the
> repository URL
> 
> since $origin and $component also come from $pkgfile at the call sites, we could
> maybe just pass in $pkgfile?
> 
> other than that, this looks okay to me since our components all contain the
> product, so this allows differentiation :)

just to be sure: is ceph with it's `test` and `main` covered too?