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: [pve-devel] [PATCH v3 manager] api: apt: repos: fix interfacing with perlmod
Date: Fri, 16 Jul 2021 14:57:34 +0200	[thread overview]
Message-ID: <20210716125734.87163-1-f.ebner@proxmox.com> (raw)

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





             reply	other threads:[~2021-07-16 12:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-16 12:57 Fabian Ebner [this message]
2021-07-16 13:05 ` Fabian Ebner

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=20210716125734.87163-1-f.ebner@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