diff options
| author | drebs <drebs@leap.se> | 2015-04-09 14:30:11 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-04-09 14:30:11 -0300 |
| commit | 4a8413505faf70138f5b16dc4a845c4e0219b872 (patch) | |
| tree | 129ed14eec2e0aeae71999945e350482ae99e50c | |
| parent | b44103de55cd9d2f347c344c23d71cb87d8d06cb (diff) | |
| parent | 9c527fe9aa6ceaa7ed380a31ac4e1e4bfdc566dd (diff) | |
Merge tag '0.6.4' into release/0.6.x
version 0.6.4
| -rw-r--r-- | common/MANIFEST.in | 4 | ||||
| -rw-r--r-- | common/changes/bug_6671-bail-out-if-no-cdocs-dir | 1 | ||||
| -rw-r--r-- | common/setup.py | 5 |
3 files changed, 10 insertions, 0 deletions
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` |