From 0fd5547a8a5fa6989f5e39ba0b00e00f4cf8a56a Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Mon, 14 May 2012 15:31:37 +0200 Subject: [PATCH] Fix _ComputeNewInstanceViolations logic This function did the opposite: was computing which old instance violated the specs but no longer do it now. new - old is the expected behaviour. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Michael Hanselmann <hansmi@google.com> --- lib/cmdlib.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 18b2554d0..016b070fc 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -1276,11 +1276,12 @@ def _ComputeNewInstanceViolations(old_ipolicy, new_ipolicy, instances): @param old_ipolicy: The current (still in-place) ipolicy @param new_ipolicy: The new (to become) ipolicy @param instances: List of instances to verify - @return: A list of instances which violates the new ipolicy but did not before + @return: A list of instances which violates the new ipolicy but + did not before """ - return (_ComputeViolatingInstances(old_ipolicy, instances) - - _ComputeViolatingInstances(new_ipolicy, instances)) + return (_ComputeViolatingInstances(new_ipolicy, instances) - + _ComputeViolatingInstances(old_ipolicy, instances)) def _ExpandItemName(fn, name, kind): -- GitLab