summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Koelker <jason@koelker.net>2011-07-22 16:48:04 -0500
committerJason Koelker <jason@koelker.net>2011-07-22 16:48:04 -0500
commit25fe6eec8d91115151ffbe750107684736a188ca (patch)
tree513987c78bfabfbe4ad1f58a599f786959ba9d46
parente54f0cb05a3e10ad4234c672e2096da2a3eaa2da (diff)
parent15e7084b7a8378da215d43659f310195f841ef01 (diff)
merge trunk
-rw-r--r--nova/network/manager.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 3b3f524c4..7301df64b 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -370,8 +370,7 @@ class NetworkManager(manager.SchedulerDependentManager):
try:
networks = self.db.network_get_all(context)
except exception.NoNetworksFound:
- # we don't care if no networks are found
- pass
+ return []
# return only networks which are not vlan networks
return [network for network in networks if