diff options
| author | Kali Kaneko <kali@leap.se> | 2015-01-23 14:54:08 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-01-23 15:36:08 -0400 |
| commit | 9c527fe9aa6ceaa7ed380a31ac4e1e4bfdc566dd (patch) | |
| tree | 107d3676ac7541599391566e3985688eb65b7c96 | |
| parent | ef0d008b53ac214dc77fe572f2cc5d18efbd1b35 (diff) | |
Bail out ddocs installation if the path doesn't exist. Fix: #66710.6.4
Conflicts:
common/MANIFEST.in
| -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` |