diff options
| author | Kali Kaneko <kali@leap.se> | 2015-01-23 14:54:08 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-02-11 14:03:18 -0400 |
| commit | 661ee9eb1ce29056f219a2a95688840cebcf889a (patch) | |
| tree | 128b35c2855a195f516917e0af001dd0c2888c2c | |
| parent | c654d5e777c0d1db75b5f3586bd20ce2ec4edadc (diff) | |
Bail out ddocs installation if the path doesn't exist. Fix: #6671
| -rw-r--r-- | common/MANIFEST.in | 3 | ||||
| -rw-r--r-- | common/changes/bug_6671-bail-out-if-no-cdocs-dir | 1 | ||||
| -rw-r--r-- | common/setup.py | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/common/MANIFEST.in b/common/MANIFEST.in index 8e5a2342..a26a12a6 100644 --- a/common/MANIFEST.in +++ b/common/MANIFEST.in @@ -2,4 +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 92f4827d..b0ab8352 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` |