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 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