merge trunk

2011-07-22 16:48:04 -05:00
parent e54f0cb05a 15e7084b7a
commit 25fe6eec8d
1 changed files with 1 additions and 2 deletions
--- 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