summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-27 15:31:54 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-27 15:31:54 -0300
commit963e648a33dc6bb0358d788a747a29f9c403018d (patch)
tree586282167b5f86a9194f3d8e0a30c008ad52e101 /server
parent0c9e8abab36c2a8c53bb4a77ffd5bd4cf654bb87 (diff)
parent18241699c963921ebf3e990ad19c0fd60c673f05 (diff)
Merge remote-tracking branch 'kali/bug/bypass-init-install' into develop
Diffstat (limited to 'server')
-rw-r--r--server/setup.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/server/setup.py b/server/setup.py
index e5c36278..348aa838 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -29,7 +29,8 @@ 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
@@ -71,5 +72,5 @@ setup(
packages=find_packages('src'),
package_dir={'': 'src'},
install_requires=utils.parse_requirements(),
- data_files=data_files,
+ data_files=data_files
)