public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH v4 manager] api: apt: repos: fix interfacing with perlmod
Date: Thu, 18 Nov 2021 14:03:57 +0100	[thread overview]
Message-ID: <54954ec8-a74e-314a-cc91-9119cd83ab96@proxmox.com> (raw)
In-Reply-To: <20210716132753.102535-1-f.ebner@proxmox.com>

Seems like I forgot about this one. Still applies and I quickly tested 
to make sure it still fixes the issue.

Am 16.07.21 um 15:27 schrieb Fabian Ebner:
> Using
>      pvesh create /nodes/pve701/apt/repositories --path
>      "/etc/apt/sources.list" --index 0 --enabled 1
> reliably leads to
>      error: invalid type: string "0", expected usize
> 
> Coerce to int to avoid this. I was not able to trigger the issue with
> the "enabled" option being a string here (in PMG I was), but be on the
> safe side and coerce there too. Otherwise it might get triggered by a
> future, completely unrelated change further up in the API call
> handling.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> 
> Changes from v3:
>      * shorter/cleaner code, but now there's no good reason for the
>        comment anymore, because it's arguably the better code even
>        without the perlmod limitation. But I do have a reproducer, so
>        hopefully the issue can be fixed in perlmod before somebody else
>        runs into it.

Handling of undef key in a hash was fixed by Wolfgang in perlmod >= 
0.5.3-1, so factoring out the assignment to the 'enabled' key would not 
be necessary anymore, but the coercions to int still are.

> 
>   PVE/API2/APT.pm | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
> index bd60db33..ec9503de 100644
> --- a/PVE/API2/APT.pm
> +++ b/PVE/API2/APT.pm
> @@ -750,13 +750,14 @@ __PACKAGE__->register_method({
>       code => sub {
>   	my ($param) = @_;
>   
> -	my $options = {
> -	    enabled => $param->{enabled},
> -	};
> +	my $options = {};
> +
> +	my $enabled = $param->{enabled};
> +	$options->{enabled} = int($enabled) if defined($enabled);
>   
>   	PVE::RS::APT::Repositories::change_repository(
>   	    $param->{path},
> -	    $param->{index},
> +	    int($param->{index}),
>   	    $options,
>   	    $param->{digest}
>   	);
> 




  reply	other threads:[~2021-11-18 13:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-16 13:27 Fabian Ebner
2021-11-18 13:03 ` Fabian Ebner [this message]
2022-02-16  7:36 ` Fabian Ebner
2022-02-17 13:34 ` [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=54954ec8-a74e-314a-cc91-9119cd83ab96@proxmox.com \
    --to=f.ebner@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal