public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH container] fix #3927: Stopped containers now return 0, like VMs do
@ 2022-03-17 10:15 Daniel Tschlatscher
  2022-03-17 10:45 ` Matthias Heiserer
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Tschlatscher @ 2022-03-17 10:15 UTC (permalink / raw)
  To: pve-devel

Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
---
 src/PVE/API2/LXC/Status.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/PVE/API2/LXC/Status.pm b/src/PVE/API2/LXC/Status.pm
index f7e3128..f414f7a 100644
--- a/src/PVE/API2/LXC/Status.pm
+++ b/src/PVE/API2/LXC/Status.pm
@@ -237,8 +237,12 @@ __PACKAGE__->register_method({
 	my $skiplock = extract_param($param, 'skiplock');
 	raise_param_exc({ skiplock => "Only root may use this option." })
 	    if $skiplock && $authuser ne 'root@pam';
-
-	die "CT $vmid not running\n" if !PVE::LXC::check_running($vmid);
+	
+	# Containers that are already stopped should exit with code 0, like VMs do
+	if (!PVE::LXC::check_running($vmid)) {
+		print "CT $vmid not running\n";
+		exit 0;
+	}
 
 	if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
 
-- 
2.30.2




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [pve-devel] [PATCH container] fix #3927: Stopped containers now return 0, like VMs do
  2022-03-17 10:15 [pve-devel] [PATCH container] fix #3927: Stopped containers now return 0, like VMs do Daniel Tschlatscher
@ 2022-03-17 10:45 ` Matthias Heiserer
  0 siblings, 0 replies; 2+ messages in thread
From: Matthias Heiserer @ 2022-03-17 10:45 UTC (permalink / raw)
  To: Proxmox VE development discussion, Daniel Tschlatscher

On 17.03.2022 11:15, Daniel Tschlatscher wrote:
> Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
> ---
>   src/PVE/API2/LXC/Status.pm | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/src/PVE/API2/LXC/Status.pm b/src/PVE/API2/LXC/Status.pm
> index f7e3128..f414f7a 100644
> --- a/src/PVE/API2/LXC/Status.pm
> +++ b/src/PVE/API2/LXC/Status.pm
> @@ -237,8 +237,12 @@ __PACKAGE__->register_method({
>   	my $skiplock = extract_param($param, 'skiplock');
>   	raise_param_exc({ skiplock => "Only root may use this option." })
>   	    if $skiplock && $authuser ne 'root@pam';
> -
> -	die "CT $vmid not running\n" if !PVE::LXC::check_running($vmid);
> +	Trailing whitespace
> +	# Containers that are already stopped should exit with code 0, like VMs do
> +	if (!PVE::LXC::check_running($vmid)) {
> +		print "CT $vmid not running\n";
> +		exit 0;
> +	}
Wrong identation, should be tab + 4 spaces
>   
>   	if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
>   





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-17 10:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-17 10:15 [pve-devel] [PATCH container] fix #3927: Stopped containers now return 0, like VMs do Daniel Tschlatscher
2022-03-17 10:45 ` Matthias Heiserer

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