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 D5D2564F17 for ; Tue, 21 Jul 2020 14:30:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C8248186B6 for ; Tue, 21 Jul 2020 14:30:18 +0200 (CEST) Received: from sara.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8C5C0186AC for ; Tue, 21 Jul 2020 14:30:17 +0200 (CEST) Received: by sara.proxmox.com (Postfix, from userid 1000) id 69AC631B6; Tue, 21 Jul 2020 14:30:17 +0200 (CEST) From: Moayad Almalat To: pmg-devel@pve.proxmox.com Date: Tue, 21 Jul 2020 14:30:16 +0200 Message-Id: <20200721123016.155987-1-m.almalat@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL 0.012 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.251 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pmgupgrade.pm, nodes.pm, apt.pm] Subject: [pmg-devel] [PATCH pmg-api v2] api: replace apt-get to apt 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: Tue, 21 Jul 2020 12:30:48 -0000 Signed-off-by: Moayad Almalat --- src/PMG/API2/APT.pm | 6 +++--- src/PMG/API2/Nodes.pm | 2 +- src/PMG/CLI/pmgupgrade.pm | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PMG/API2/APT.pm b/src/PMG/API2/APT.pm index 51b998f..ae14fdf 100644 --- a/src/PMG/API2/APT.pm +++ b/src/PMG/API2/APT.pm @@ -269,7 +269,7 @@ __PACKAGE__->register_method({ name => 'update_database', path => 'update', method => 'POST', - description => "This is used to resynchronize the package index files from their sources (apt-get update).", + description => "This is used to resynchronize the package index files from their sources (apt update).", protected => 1, proxyto => 'node', permissions => { check => [ 'admin' ] }, @@ -314,9 +314,9 @@ __PACKAGE__->register_method({ my $aptcfn = "/etc/apt/apt.conf.d/76pmgproxy"; PVE::Tools::file_set_contents($aptcfn, $aptconf); - my $cmd = ['apt-get', 'update']; + my $cmd = ['apt', 'update']; - print "starting apt-get update\n" if !$param->{quiet}; + print "starting apt update\n" if !$param->{quiet}; if ($param->{quiet}) { PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}); diff --git a/src/PMG/API2/Nodes.pm b/src/PMG/API2/Nodes.pm index 96aa146..9b7ad51 100644 --- a/src/PMG/API2/Nodes.pm +++ b/src/PMG/API2/Nodes.pm @@ -341,7 +341,7 @@ __PACKAGE__->register_method ({ node => get_standard_option('pve-node'), upgrade => { type => 'boolean', - description => "Run 'apt-get dist-upgrade' instead of normal shell.", + description => "Run 'apt dist-upgrade' instead of normal shell.", optional => 1, default => 0, }, diff --git a/src/PMG/CLI/pmgupgrade.pm b/src/PMG/CLI/pmgupgrade.pm index 50fbcbd..22c0f1a 100755 --- a/src/PMG/CLI/pmgupgrade.pm +++ b/src/PMG/CLI/pmgupgrade.pm @@ -47,13 +47,13 @@ __PACKAGE__->register_method ({ return undef; } - my $cmdstr = 'apt-get dist-upgrade'; + my $cmdstr = 'apt --option Apt::Cmd::Disable-Script-Warning=true update'; - print "Starting system upgrade: apt-get dist-upgrade\n"; + print "Starting system upgrade: apt dist-upgrade\n"; my $oldlist = PMG::API2::APT->list_updates({ node => $nodename}); - system('apt-get', 'dist-upgrade'); + system('apt --option Apt::Cmd::Disable-Script-Warning=true dist-upgrade'); my $pkglist = PMG::API2::APT->list_updates({ node => $nodename}); -- 2.20.1