From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 7C2EE80923
for <pve-devel@lists.proxmox.com>; Thu, 18 Nov 2021 14:04:35 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 69B841BDE1
for <pve-devel@lists.proxmox.com>; Thu, 18 Nov 2021 14:04:05 +0100 (CET)
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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id DEF231BDD2
for <pve-devel@lists.proxmox.com>; Thu, 18 Nov 2021 14:04:04 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AAC3F43DFE
for <pve-devel@lists.proxmox.com>; Thu, 18 Nov 2021 14:03:58 +0100 (CET)
To: pve-devel@lists.proxmox.com
References: <20210716132753.102535-1-f.ebner@proxmox.com>
From: Fabian Ebner <f.ebner@proxmox.com>
Message-ID: <54954ec8-a74e-314a-cc91-9119cd83ab96@proxmox.com>
Date: Thu, 18 Nov 2021 14:03:57 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.14.0
MIME-Version: 1.0
In-Reply-To: <20210716132753.102535-1-f.ebner@proxmox.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.534 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
NICE_REPLY_A -1.009 Looks like a legit reply (A)
POISEN_SPAM_PILL 0.1 Meta: its spam
POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes
POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pve-devel] [PATCH v4 manager] api: apt: repos: fix interfacing
with perlmod
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 18 Nov 2021 13:04:35 -0000
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}
> );
>