* [pve-devel] [PATCH manager] api: apt: repos: fix interfacing with perlmod
@ 2021-07-15 6:47 Fabian Ebner
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Ebner @ 2021-07-15 6:47 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 here (in PMG I was), but be on the safe side and
coerce there too.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Changes from v1:
* avoid creating an implicit default by checking definedness first
PVE/API2/APT.pm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index bd60db33..310d875f 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -750,13 +750,16 @@ __PACKAGE__->register_method({
code => sub {
my ($param) = @_;
+ my $enabled = $param->{enabled};
+ $enabled = int($enabled) if defined($enabled);
+
my $options = {
- enabled => $param->{enabled},
+ enabled => $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] 3+ messages in thread
* [pve-devel] [PATCH manager] api: apt: repos: fix interfacing with perlmod
@ 2021-07-13 8:19 Fabian Ebner
2021-07-15 6:30 ` Fabian Ebner
0 siblings, 1 reply; 3+ messages in thread
From: Fabian Ebner @ 2021-07-13 8:19 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 here (in PMG I was), but be on the safe side and
coerce there too.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/API2/APT.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index bd60db33..16e3af6d 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -751,12 +751,12 @@ __PACKAGE__->register_method({
my ($param) = @_;
my $options = {
- enabled => $param->{enabled},
+ enabled => int($param->{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] 3+ messages in thread
* Re: [pve-devel] [PATCH manager] api: apt: repos: fix interfacing with perlmod
2021-07-13 8:19 Fabian Ebner
@ 2021-07-15 6:30 ` Fabian Ebner
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Ebner @ 2021-07-15 6:30 UTC (permalink / raw)
To: pve-devel
Am 13.07.21 um 10:19 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 here (in PMG I was), but be on the safe side and
> coerce there too.
>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> PVE/API2/APT.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
> index bd60db33..16e3af6d 100644
> --- a/PVE/API2/APT.pm
> +++ b/PVE/API2/APT.pm
> @@ -751,12 +751,12 @@ __PACKAGE__->register_method({
> my ($param) = @_;
>
> my $options = {
> - enabled => $param->{enabled},
> + enabled => int($param->{enabled}),
This needs to be guaded by a definedness check as the parameter is
optional and has no default. I'll send a v2 and a patch for PMG too.
> };
>
> PVE::RS::APT::Repositories::change_repository(
> $param->{path},
> - $param->{index},
> + int($param->{index}),
> $options,
> $param->{digest}
> );
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-15 6:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-15 6:47 [pve-devel] [PATCH manager] api: apt: repos: fix interfacing with perlmod Fabian Ebner
-- strict thread matches above, loose matches on Subject: below --
2021-07-13 8:19 Fabian Ebner
2021-07-15 6:30 ` Fabian Ebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox