From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 64D14769DF for ; Fri, 16 Jul 2021 15:06:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 46F6711169 for ; Fri, 16 Jul 2021 15:05:57 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4EB6511135 for ; Fri, 16 Jul 2021 15:05:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B6C1042081 for ; Fri, 16 Jul 2021 15:05:54 +0200 (CEST) To: pve-devel@lists.proxmox.com References: <20210716125734.87163-1-f.ebner@proxmox.com> From: Fabian Ebner Message-ID: <832a6d64-a5be-2741-5980-f53e84cd2e28@proxmox.com> Date: Fri, 16 Jul 2021 15:05:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210716125734.87163-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.341 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 -0.001 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 v3 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2021 13:06:27 -0000 Just noticed a shorter/cleaner way to do it. I'll send a v4, sorry for the noise. Am 16.07.21 um 14:57 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 in > the future by a completely unrelated change further up in the API call > handling. > > Signed-off-by: Fabian Ebner > --- > > Changes from v2: > * work around current perlmod limitation, but the real fault is > clearly with Perl's type system ;) > > 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 bd60db33..743c3522 100644 > --- a/PVE/API2/APT.pm > +++ b/PVE/API2/APT.pm > @@ -750,13 +750,18 @@ __PACKAGE__->register_method({ > code => sub { > my ($param) = @_; > > - my $options = { > - enabled => $param->{enabled}, > - }; > + my $enabled = $param->{enabled}; > + $enabled = int($enabled) if defined($enabled); > + > + my $options = {}; > + > + # NOTE avoid { enabled => $enabled }, when it's undef, because current (0.5.2) perlmod > + # can get confused in some cases and fail to recognize undef correctly. > + $options->{enabled} = $enabled if defined($enabled); > > PVE::RS::APT::Repositories::change_repository( > $param->{path}, > - $param->{index}, > + int($param->{index}), > $options, > $param->{digest} > ); >