diff options
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | server/setup.py | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules index a5f1aa27..c66ed435 100755 --- a/debian/rules +++ b/debian/rules @@ -12,9 +12,9 @@ override_dh_auto_clean: cd server && python setup.py clean -a override_dh_auto_install: - cd common && python setup.py install --root=../debian/soledad-common - cd server && python setup.py install --root=../debian/soledad-server cd client && python setup.py install --root=../debian/soledad-client + cd common && python setup.py install --root=../debian/soledad-common + cd server && LEAP_SKIP_INIT=1 python setup.py install --root=../debian/soledad-server override_dh_install: # leap.soledad provides the leap.soledad namespace __init__.py diff --git a/server/setup.py b/server/setup.py index 238ad461..22be3fd3 100644 --- a/server/setup.py +++ b/server/setup.py @@ -29,11 +29,11 @@ versioneer.parentdir_prefix = 'leap.soledad.server-' from pkg import utils -if os.environ.get('VIRTUAL_ENV', None): +isset = lambda var: os.environ.get(var, None) +if isset('VIRTUAL_ENV') or isset('LEAP_SKIP_INIT'): data_files = None else: # XXX this should go only for linux/mac - # disabled on debian so the packaging can install it data_files = [("/etc/init.d/", ["pkg/soledad"])] @@ -71,6 +71,5 @@ setup( packages=find_packages('src'), package_dir={'': 'src'}, install_requires=utils.parse_requirements(), - # disabled on debian so the packaging can handle it - #data_files=data_files, + data_files=data_files ) |