diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-09-17 19:30:15 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-09-17 19:30:15 -0300 |
| commit | ca7f6737e03143ae80add83d41860246f5459eae (patch) | |
| tree | 54c6883c37599536694380ba05ce89380ff90f71 | |
| parent | 703fa8efdfa6a201921bae97edc653e60b977b85 (diff) | |
[bug] ensure needs to check into all design docs
This code only checks for 'docs' presence, while we have 3 design
documents. If one of them is missing, but 'docs' is not, then it will
not ensure the others.
This is needed to properly ensure ddocs on create command line script.
| -rw-r--r-- | common/src/leap/soledad/common/couch.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/common/src/leap/soledad/common/couch.py b/common/src/leap/soledad/common/couch.py index 82b5aca8..1c762036 100644 --- a/common/src/leap/soledad/common/couch.py +++ b/common/src/leap/soledad/common/couch.py @@ -485,13 +485,10 @@ class CouchDatabase(CommonBackend): Ensure that the design documents used by the backend exist on the couch database. """ - # we check for existence of one of the files, and put all of them if - # that one does not exist - try: - self._database['_design/docs'] - return - except ResourceNotFound: - for ddoc_name in ['docs', 'syncs', 'transactions']: + for ddoc_name in ['docs', 'syncs', 'transactions']: + try: + self._database.info(ddoc_name) + except ResourceNotFound: ddoc = json.loads( binascii.a2b_base64( getattr(ddocs, ddoc_name))) |