summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-17 22:23:35 +0100
committerSoren Hansen <soren@linux2go.dk>2011-03-17 22:23:35 +0100
commitcf648ea89015818a3ec7c8d6d59b50f8ed3604f7 (patch)
treec14cd859ea6314daccba90f7de2bea45955fe054
parent8c6184a3cd55a49dcc01885aa7d78e8c9eba7c14 (diff)
downloadnova-cf648ea89015818a3ec7c8d6d59b50f8ed3604f7.tar.gz
nova-cf648ea89015818a3ec7c8d6d59b50f8ed3604f7.tar.xz
nova-cf648ea89015818a3ec7c8d6d59b50f8ed3604f7.zip
Fix mis-merge
-rw-r--r--nova/virt/libvirt_conn.py2
1 files changed, 1 insertions, 1 deletions
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 "