Skip to content

Commit

Permalink
wafsamba: install Python modules back to bin/python, not bin/python_m…
Browse files Browse the repository at this point in the history
…odules

Partially revert 80fce35 which started
installing generated Python modules into python_modules directory back
in 2013. This, unfortunately, does not work anymore as Python gets quite
confused with our setup even when both bin/python and bin/python_modules
directories are part of sys.path.

Signed-off-by: Alexander Bokovoy <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
  • Loading branch information
abbra authored and abartlet committed Sep 5, 2018
1 parent 77f3a13 commit 31f8945
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion buildtools/wafsamba/samba_python.py
Original file line number Diff line number Diff line change
@@ -153,7 +153,7 @@ def SAMBA_PYTHON(bld, name,
source = bld.EXPAND_VARIABLES(source, vars=vars)

if realname is not None:
link_name = 'python_modules/%s' % realname
link_name = 'python/%s' % realname
else:
link_name = None

2 changes: 1 addition & 1 deletion buildtools/wafsamba/wafsamba.py
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ def SAMBA_BUILD_ENV(conf):
# this allows all of the bin/shared and bin/python targets
# to be expressed in terms of build directory paths
mkdir_p(os.path.join(conf.env.BUILD_DIRECTORY, 'default'))
for (source, target) in [('shared', 'shared'), ('modules', 'modules'), ('python', 'python_modules')]:
for (source, target) in [('shared', 'shared'), ('modules', 'modules'), ('python', 'python')]:
link_target = os.path.join(conf.env.BUILD_DIRECTORY, 'default/' + target)
if not os.path.lexists(link_target):
os.symlink('../' + source, link_target)

0 comments on commit 31f8945

Please sign in to comment.