From d72e36d63b1aefe7731d5c832c2b2fa52227407c Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 9 Aug 2011 11:10:14 -0400
Subject: making usage of 'delete' argument more clear

---
 nova/compute/api.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 867f6ce99..aaff8b370 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1183,14 +1183,12 @@ class API(base.Base):
         `metadata` argument will be deleted.
 
         """
-        if not delete:
+        if delete:
+            _metadata = metadata
+        else:
             _metadata = self.get_instance_metadata(context, instance_id)
             _metadata.update(metadata)
-        else:
-            _metadata = metadata
 
         self._check_metadata_properties_quota(context, _metadata)
-
         self.db.instance_metadata_update(context, instance_id, _metadata, True)
-
         return _metadata
-- 
cgit