On Wed, Jan 04, 2017 at 02:11:15PM +0000, 'Federico Morg Pareschi' via 
ganeti-devel wrote:
> As introduced by commit 77807d831976cf018ace04961820987a91c1d58a
> and was not caught during the code review process.
> 
> Signed-off-by: Federico Morg Pareschi <[email protected]>
> ---
>  lib/cmdlib/instance_set_params.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/cmdlib/instance_set_params.py 
> b/lib/cmdlib/instance_set_params.py
> index d443c9cdb..228f8aa3c 100644
> --- a/lib/cmdlib/instance_set_params.py
> +++ b/lib/cmdlib/instance_set_params.py
> @@ -994,9 +994,9 @@ class LUInstanceSetParams(LogicalUnit):
>                     else self.instance.os)
>  
>      if compat.any(
> -        self.op.osparams, self.op.osparams_private,
> -        self.op.clear_osparams, self.op.clear_osparams_private,
> -        self.op.remove_osparams, self.op.remove_osparams_private):
> +        [self.op.osparams, self.op.osparams_private,
> +         self.op.clear_osparams, self.op.clear_osparams_private,
> +         self.op.remove_osparams, self.op.remove_osparams_private]):
>        public_parms = self.op.osparams or {}
>        private_parms = self.op.osparams_private or {}
>        remove_osparams = self.op.remove_osparams or []

D'oh! That's embarrassing. I made this mistake more than once, too. See also
d388e30c6d

Thanks,
Brian.

Reply via email to