[pve-devel] applied: [PATCH v6 manager 2/6] deprecate old upgrade property

[Thomas Lamprecht]

On 2/27/19 3:01 PM, Tim Marx wrote:
> Signed-off-by: Tim Marx <t.marx at proxmox.com>
> ---
>  PVE/API2/Nodes.pm | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 

applied, thanks!

> diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
> index 1a1e260a..41865b99 100644
> --- a/PVE/API2/Nodes.pm
> +++ b/PVE/API2/Nodes.pm
> @@ -736,7 +736,7 @@ __PACKAGE__->register_method ({
>  	    node => get_standard_option('pve-node'),
>  	    upgrade => {
>  		type => 'boolean',
> -		description => "Run 'apt-get dist-upgrade' instead of normal shell.",
> +		description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
>  		optional => 1,
>  		default => 0,
>  	    },
> @@ -812,7 +812,8 @@ __PACKAGE__->register_method ({
>  	# so we select the fastest chipher here (or 'none'?)
>  	my $remcmd = $remip ?
>  	    ['/usr/bin/ssh', '-e', 'none', '-t', $remip] : [];
> -
> +	

followed up with fixing this whitespace errror above, though ;-)

> +	# FIXME: remove with 6.0
>  	if ($param->{upgrade}) {
>  	    $param->{cmd} = 'upgrade';
>  	}
> @@ -893,7 +894,7 @@ __PACKAGE__->register_method ({
>  	    node => get_standard_option('pve-node'),
>  	    upgrade => {
>  		type => 'boolean',
> -		description => "Run 'apt-get dist-upgrade' instead of normal shell.",
> +		description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
>  		optional => 1,
>  		default => 0,
>  	    },
> @@ -942,7 +943,7 @@ __PACKAGE__->register_method ({
>  
>  	my $remcmd = $remip ?
>  	    ['/usr/bin/ssh', '-e', 'none', '-t', $remip , '--'] : [];
> -
> +	# FIXME: remove with 6.0
>  	if ($param->{upgrade}) {
>  	    $param->{cmd} = 'upgrade';
>  	}
> @@ -1040,7 +1041,7 @@ __PACKAGE__->register_method ({
>  	    proxy => get_standard_option('spice-proxy', { optional => 1 }),
>  	    upgrade => {
>  		type => 'boolean',
> -		description => "Run 'apt-get dist-upgrade' instead of normal shell.",
> +		description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
>  		optional => 1,
>  		default => 0,
>  	    },
> @@ -1071,7 +1072,7 @@ __PACKAGE__->register_method ({
>  
>  	my $authpath = "/nodes/$node";
>  	my $permissions = 'Sys.Console';
> -
> +	# FIXME: remove with 6.0
>  	if ($param->{upgrade}) {
>  	    $param->{cmd} = 'upgrade';
>  	}
>