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 034E17B0E8; Thu, 7 Jul 2022 12:39:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EECCA1DE08; Thu, 7 Jul 2022 12:38:49 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS; Thu, 7 Jul 2022 12:38:49 +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 1080543DEA; Thu, 7 Jul 2022 12:38:49 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com Date: Thu, 7 Jul 2022 12:38:44 +0200 Message-Id: <20220707103844.73931-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707103844.73931-1-f.ebner@proxmox.com> References: <20220707103844.73931-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [apt.pm] Subject: [pmg-devel] [PATCH v2 pmg-api] api: apt: switch to common Proxmox::RS::APT::Repositories package X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2022 10:39:20 -0000 which is shared between PVE and PMG. Signed-off-by: Fabian Ebner --- No changes from v1. (build-)dependency bumps for libproxmox-perl-rs needed. src/PMG/API2/APT.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/PMG/API2/APT.pm b/src/PMG/API2/APT.pm index 18bb992..d6f050f 100644 --- a/src/PMG/API2/APT.pm +++ b/src/PMG/API2/APT.pm @@ -20,7 +20,8 @@ use PVE::JSONSchema qw(get_standard_option); use PMG::RESTEnvironment; use PMG::pmgcfg; use PMG::Config; -use PMG::RS::APT::Repositories; + +use Proxmox::RS::APT::Repositories; use AptPkg::Cache; use AptPkg::Version; @@ -668,7 +669,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - return PMG::RS::APT::Repositories::repositories(); + return Proxmox::RS::APT::Repositories::repositories("pmg"); }}); __PACKAGE__->register_method({ @@ -701,7 +702,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - PMG::RS::APT::Repositories::add_repository($param->{handle}, $param->{digest}); + Proxmox::RS::APT::Repositories::add_repository($param->{handle}, "pmg", $param->{digest}); }}); __PACKAGE__->register_method({ @@ -748,7 +749,7 @@ __PACKAGE__->register_method({ my $enabled = $param->{enabled}; $options->{enabled} = int($enabled) if defined($enabled); - PMG::RS::APT::Repositories::change_repository( + Proxmox::RS::APT::Repositories::change_repository( $param->{path}, int($param->{index}), $options, -- 2.30.2