[MERGE] forward port branch saas-12 up to 10cde43

2016-09-16 11:03:50 +02:00
parent d4b878af53 10cde43fd4
commit f4fc3985b6
34 changed files with 142 additions and 48 deletions
@@ -156,7 +156,7 @@ def get_module_path(module, downloaded=False, display_warning=True):
    """
    initialize_sys_path()
    for adp in ad_paths:
-        if os.path.exists(opj(adp, module)) or os.path.exists(opj(adp, '%s.zip' % module)):
+        if os.path.exists(opj(adp, module, MANIFEST)) or os.path.exists(opj(adp, '%s.zip' % module)):
            return opj(adp, module)

    if downloaded: