git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4571b94
)
s4-python: Fix use of bundled modules.
author
Jelmer Vernooij
<jelmer@samba.org>
Thu, 9 Dec 2010 20:38:48 +0000
(21:38 +0100)
committer
Jelmer Vernooij
<jelmer@samba.org>
Fri, 10 Dec 2010 02:04:06 +0000
(
03:04
+0100)
source4/scripting/python/samba/__init__.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/__init__.py
b/source4/scripting/python/samba/__init__.py
index f88ac74dcabc235b94621025b49dbdfedf033bb5..b6c53f4b2c1bbe0408fcbebd2b7c755cde627362 100644
(file)
--- a/
source4/scripting/python/samba/__init__.py
+++ b/
source4/scripting/python/samba/__init__.py
@@
-334,7
+334,7
@@
def ensure_external_module(modulename, location):
try:
__import__(modulename)
except ImportError:
- import_bundled_package(modulename)
+ import_bundled_package(modulename
, location
)
from samba import _glue