From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 29 Sep 2011 21:30:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.1-1~174^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=47512a4eccb13be5eb93e239c6c81e3a5ba48581;hp=02b0e2e01626e90041cad00f79c9a75bd6d9877b;p=sfa.git

Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
---

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index 2b86b587..ea8f2afc 100644
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -681,6 +681,8 @@ def updateMeta():
         logger.debug('[update process] dbResults: %s' % dbResults)
         instids = []
         for r in dbResults:
+            if not r.instance:
+                continue
             instids.append(r.instance.instance_id)
         logger.debug('[update process] Instance Id: %s' % ', '.join(instids))