From cf648ea89015818a3ec7c8d6d59b50f8ed3604f7 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Thu, 17 Mar 2011 22:23:35 +0100
Subject: Fix mis-merge

---
 nova/virt/libvirt_conn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 2f6948556..e80b9fbdf 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -1015,7 +1015,7 @@ class LibvirtConnection(object):
 
             keys = ['cores', 'sockets', 'threads']
             tkeys = topology.keys()
-            if list(set(tkeys)) != list(set(keys)):
+            if set(tkeys) != set(keys):
                 ks = ', '.join(keys)
                 raise exception.Invalid(_("Invalid xml: topology"
                                           "(%(topology)s) must have "
-- 
cgit