diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2013-05-01 10:46:42 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-05-20 09:23:03 -0500 |
| commit | 8d2b8e6457d5ae0ed1136091cb8c143a96abd614 (patch) | |
| tree | 4472ca5c4eaea0ca13a1cf71fc8c645b9d51182e /keystone/trust | |
| parent | 7b99bd63e13d62e7a1bcbcd7033340818b2dfa51 (diff) | |
| download | keystone-8d2b8e6457d5ae0ed1136091cb8c143a96abd614.tar.gz keystone-8d2b8e6457d5ae0ed1136091cb8c143a96abd614.tar.xz keystone-8d2b8e6457d5ae0ed1136091cb8c143a96abd614.zip | |
get SQL refs from session (bp sql-query-get)
Change-Id: I2200e33868d50bb69089f3108a5a4c061afccd6e
Diffstat (limited to 'keystone/trust')
| -rw-r--r-- | keystone/trust/backends/sql.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py index cd68b0bc..daa8e3f7 100644 --- a/keystone/trust/backends/sql.py +++ b/keystone/trust/backends/sql.py @@ -114,10 +114,8 @@ class Trust(sql.Base, trust.Driver): def delete_trust(self, trust_id): session = self.get_session() with session.begin(): - try: - trust_ref = (session.query(TrustModel). - filter_by(id=trust_id).one()) - except sql.NotFound: + trust_ref = session.query(TrustModel).get(trust_id) + if not trust_ref: raise exception.TrustNotFound(trust_id=trust_id) trust_ref.deleted_at = timeutils.utcnow() session.flush() |