* [pve-devel] [PATCH v3 manager] api: apt: repos: fix interfacing with perlmod
@ 2021-07-16 12:57 Fabian Ebner
2021-07-16 13:05 ` Fabian Ebner
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Ebner @ 2021-07-16 12:57 UTC (permalink / raw)
To: pve-devel
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 <f.ebner@proxmox.com>
---
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}
);
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [pve-devel] [PATCH v3 manager] api: apt: repos: fix interfacing with perlmod
2021-07-16 12:57 [pve-devel] [PATCH v3 manager] api: apt: repos: fix interfacing with perlmod Fabian Ebner
@ 2021-07-16 13:05 ` Fabian Ebner
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Ebner @ 2021-07-16 13:05 UTC (permalink / raw)
To: pve-devel
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 <f.ebner@proxmox.com>
> ---
>
> 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}
> );
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-16 13:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-16 12:57 [pve-devel] [PATCH v3 manager] api: apt: repos: fix interfacing with perlmod Fabian Ebner
2021-07-16 13:05 ` Fabian Ebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox