Update Keystone code from official Github repository with branch Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

1 files changed, 4 insertions, 3 deletions

diff --git a/keystone-moon/keystone/trust/backends/sql.py b/keystone-moon/keystone/trust/backends/sql.py
index 4f5ee2e5..95b18d40 100644
--- a/keystone-moon/keystone/trust/backends/sql.py
+++ b/keystone-moon/keystone/trust/backends/sql.py
@@ -16,6 +16,7 @@ import time
 
 from oslo_log import log
 from oslo_utils import timeutils
+from six.moves import range
 
 from keystone.common import sql
 from keystone import exception
@@ -135,15 +136,15 @@ class Trust(trust.Driver):
             query = query.filter_by(deleted_at=None)
         ref = query.first()
         if ref is None:
-            return None
+            raise exception.TrustNotFound(trust_id=trust_id)
         if ref.expires_at is not None and not deleted:
             now = timeutils.utcnow()
             if now > ref.expires_at:
-                return None
+                raise exception.TrustNotFound(trust_id=trust_id)
         # Do not return trusts that can't be used anymore
         if ref.remaining_uses is not None and not deleted:
             if ref.remaining_uses <= 0:
-                return None
+                raise exception.TrustNotFound(trust_id=trust_id)
         trust_dict = ref.to_dict()
 
         self._add_roles(trust_id, session, trust_dict)