summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-27 18:38:56 +0200
committerKali Kaneko <kali@leap.se>2013-08-27 18:38:56 +0200
commite73ea3d9b7bf104e35068b1072c9b3f34e195106 (patch)
treecd07814173ee5521939ff9b68c49de2cad5aa650
parentc2f02681617ec7111bb65d9bbfc6123183268c2a (diff)
add bypass var for init files
-rw-r--r--server/setup.py7
1 files changed, 3 insertions, 4 deletions
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
)