diff options
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 13 | 
1 files changed, 9 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 87753b5a1d..50ecde2829 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -402,10 +402,15 @@ def ensure_external_module(modulename, location):      try:          __import__(modulename)      except ImportError: -        sys.path.insert(0,  -            os.path.join(os.path.dirname(__file__), -                         "../../../../lib", location)) -        __import__(modulename) +        import sys +        if _in_source_tree(): +            sys.path.insert(0,  +                os.path.join(os.path.dirname(__file__), +                             "../../../../lib", location)) +            __import__(modulename) +        else: +            sys.modules[modulename] = __import__( +                "samba.external.%s" % modulename, fromlist=["samba.external"])  version = glue.version  | 
