From 9c527fe9aa6ceaa7ed380a31ac4e1e4bfdc566dd Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 23 Jan 2015 14:54:08 -0400 Subject: Bail out ddocs installation if the path doesn't exist. Fix: #6671 Conflicts: common/MANIFEST.in --- common/MANIFEST.in | 4 ++++ common/changes/bug_6671-bail-out-if-no-cdocs-dir | 1 + common/setup.py | 5 +++++ 3 files changed, 10 insertions(+) create mode 100644 common/changes/bug_6671-bail-out-if-no-cdocs-dir (limited to 'common') diff --git a/common/MANIFEST.in b/common/MANIFEST.in index 7f6148ef..a26a12a6 100644 --- a/common/MANIFEST.in +++ b/common/MANIFEST.in @@ -2,3 +2,7 @@ include pkg/* include versioneer.py include LICENSE include CHANGELOG + +# What do we want the ddocs folder in the source package for? -- kali +# it should be enough with having the compiled stuff. +recursive-include src/leap/soledad/common/ddocs * diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir new file mode 100644 index 00000000..e57e50e5 --- /dev/null +++ b/common/changes/bug_6671-bail-out-if-no-cdocs-dir @@ -0,0 +1 @@ +o Bail out if cdocs/ dir does not exist. Closes: #6671 diff --git a/common/setup.py b/common/setup.py index 6ee166ef..365006b2 100644 --- a/common/setup.py +++ b/common/setup.py @@ -155,6 +155,11 @@ def build_ddocs_py(basedir=None, with_src=True): dest_prefix = join(basedir, *dest_common_path) ddocs_prefix = join(prefix, 'ddocs') + + if not isdir(ddocs_prefix): + print "No ddocs/ folder, bailing out..." + return + ddocs = {} # design docs are represented by subdirectories of `ddocs_prefix` -- cgit v1.2.3 From 1edacb035f0fc65ca26f8b1324b5cff6fdabf7bf Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 9 Apr 2015 12:20:19 -0300 Subject: [fix] remove unneded params to CouchServerState This commit removes some leftover code from a time when Soledad Server used to check for permissions on certain databases when starting (i.e. shared and tokens databases). This was later removed as correct permissions enforcement was relayed to tapicero. Closes: #6833. --- .../bug_6833_remove-unneeded-params-from-couch-server-state | 2 ++ common/src/leap/soledad/common/couch.py | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 common/changes/bug_6833_remove-unneeded-params-from-couch-server-state (limited to 'common') diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state new file mode 100644 index 00000000..2c927717 --- /dev/null +++ b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state @@ -0,0 +1,2 @@ + o Remove unneeded parameters from CouchServerState initialization. Closes + #6833. diff --git a/common/src/leap/soledad/common/couch.py b/common/src/leap/soledad/common/couch.py index 5658f4ce..b38b5b96 100644 --- a/common/src/leap/soledad/common/couch.py +++ b/common/src/leap/soledad/common/couch.py @@ -1529,20 +1529,14 @@ class CouchServerState(ServerState): Inteface of the WSGI server with the CouchDB backend. """ - def __init__(self, couch_url, shared_db_name, tokens_db_name): + def __init__(self, couch_url): """ Initialize the couch server state. :param couch_url: The URL for the couch database. :type couch_url: str - :param shared_db_name: The name of the shared database. - :type shared_db_name: str - :param tokens_db_name: The name of the tokens database. - :type tokens_db_name: str """ self._couch_url = couch_url - self._shared_db_name = shared_db_name - self._tokens_db_name = tokens_db_name def open_database(self, dbname): """ -- cgit v1.2.3 From bbb19ed9a755a079da5b79567cb98a921c02f2f4 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 9 Apr 2015 14:39:05 -0300 Subject: Fold in changes. --- common/changes/bug_6671-bail-out-if-no-cdocs-dir | 1 - common/changes/bug_6833_remove-unneeded-params-from-couch-server-state | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 common/changes/bug_6671-bail-out-if-no-cdocs-dir delete mode 100644 common/changes/bug_6833_remove-unneeded-params-from-couch-server-state (limited to 'common') diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir deleted file mode 100644 index e57e50e5..00000000 --- a/common/changes/bug_6671-bail-out-if-no-cdocs-dir +++ /dev/null @@ -1 +0,0 @@ -o Bail out if cdocs/ dir does not exist. Closes: #6671 diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state deleted file mode 100644 index 2c927717..00000000 --- a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state +++ /dev/null @@ -1,2 +0,0 @@ - o Remove unneeded parameters from CouchServerState initialization. Closes - #6833. -- cgit v1.2.3