diff options
| author | Kali Kaneko <kali@leap.se> | 2016-05-13 09:17:30 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-05-13 09:17:30 -0400 |
| commit | 016cfecf4538fa07555fc187676b3c2c078950e2 (patch) | |
| tree | 021543bdee5b6e0f8ba75314f8067569493af0c5 | |
| parent | ff04cd7ff544154c13e7b80a1e90c16c00ebe695 (diff) | |
| parent | 69a4fbcf1c8069a713c9d59b0a416da9a3b2e2c0 (diff) | |
Merge branch 'develop' into release/0.8.x0.8.1release/0.8.x
| -rw-r--r-- | CHANGELOG.rst | 7 | ||||
| -rw-r--r-- | changes/bug_6937_remove-syslog-option | 2 | ||||
| -rw-r--r-- | changes/feature_6942_use_syslog | 1 | ||||
| -rw-r--r-- | changes/feature_7272-msg-key-not-found | 1 | ||||
| -rw-r--r-- | changes/feature_7435_unit_testing | 1 | ||||
| -rw-r--r-- | changes/feature_7439_remove_provenance | 1 | ||||
| -rw-r--r-- | changes/feature_7565_couchdb_refactor | 1 | ||||
| -rw-r--r-- | src/leap/mx/couchdbhelper.py | 3 |
8 files changed, 9 insertions, 8 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 31fba49..b1824a7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,10 @@ +0.8.1 - 13 May, 2016 ++++++++++++++++++++++++++++++++ + +Bugfixes +~~~~~~~~ +- `#7961 <https://leap.se/code/issues/7961>`_: Deleted account crashes leap-mx + 0.8.0 - 18 Apr, 2016 +++++++++++++++++++++++++++++++ diff --git a/changes/bug_6937_remove-syslog-option b/changes/bug_6937_remove-syslog-option deleted file mode 100644 index d3a65c3..0000000 --- a/changes/bug_6937_remove-syslog-option +++ /dev/null @@ -1,2 +0,0 @@ - o Remove logging to syslog for now. We should only do this in the future, - when the platform is ready for it. Closes #6937. diff --git a/changes/feature_6942_use_syslog b/changes/feature_6942_use_syslog deleted file mode 100644 index ffa8f62..0000000 --- a/changes/feature_6942_use_syslog +++ /dev/null @@ -1 +0,0 @@ -- Use syslog for logging (Closes: #6859) diff --git a/changes/feature_7272-msg-key-not-found b/changes/feature_7272-msg-key-not-found deleted file mode 100644 index 2d82df8..0000000 --- a/changes/feature_7272-msg-key-not-found +++ /dev/null @@ -1 +0,0 @@ -- return a more meaningful msg if user exists but has no key (Closes: #7272) diff --git a/changes/feature_7435_unit_testing b/changes/feature_7435_unit_testing deleted file mode 100644 index 32778b7..0000000 --- a/changes/feature_7435_unit_testing +++ /dev/null @@ -1 +0,0 @@ -- set up unit testing infrastructure (Closes: #7435) diff --git a/changes/feature_7439_remove_provenance b/changes/feature_7439_remove_provenance deleted file mode 100644 index 188b9a2..0000000 --- a/changes/feature_7439_remove_provenance +++ /dev/null @@ -1 +0,0 @@ -- Don't add X-Leap-Provenance header (Closes: #7439) diff --git a/changes/feature_7565_couchdb_refactor b/changes/feature_7565_couchdb_refactor deleted file mode 100644 index dc6ac0b..0000000 --- a/changes/feature_7565_couchdb_refactor +++ /dev/null @@ -1 +0,0 @@ -- Update code to the new CouchDatabase soledad code diff --git a/src/leap/mx/couchdbhelper.py b/src/leap/mx/couchdbhelper.py index e9cf4a4..f17466d 100644 --- a/src/leap/mx/couchdbhelper.py +++ b/src/leap/mx/couchdbhelper.py @@ -100,13 +100,14 @@ class ConnectedCouchDB(client.CouchDB): pubkey = None if result["rows"]: doc = result["rows"][0]["doc"] - if doc["enabled"]: + if "enabled" not in doc or doc["enabled"]: uuid = doc["user_id"] if "keys" in doc: pubkey = doc["keys"]["pgp"] return uuid, pubkey d.addCallback(_get_uuid_and_pubkey_cbk) + d.addErrback(lambda _: (None, None)) return d def getPubkey(self, uuid): |