Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround for Ubuntu Python3 looking for modules in wrong places #17211

Merged
merged 2 commits into from
Aug 24, 2016
Merged

Workaround for Ubuntu Python3 looking for modules in wrong places #17211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cfa1be
Workaround for Ubuntu Python3 looking for modules in wrong places
abadger Aug 24, 2016
ad5afb3
More exact ubuntu version numbers
abadger Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions lib/ansible/executor/module_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,28 @@
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import os
import os.path
import sys
import __main__

# For some distros and python versions we pick up this script in the temporary
# directory. This leads to problems when the ansible module masks a python
# library that another import needs. We have not figured out what about the
# specific distros and python versions causes this to behave differently.
#
# Tested distros:
# Fedora23 with python3.4 Works
# Ubuntu15.10 with python2.7 Works
# Ubuntu15.10 with python3.4 Fails without this
# Ubuntu16.04.1 with python3.5 Fails without this
scriptdir = None
try:
scriptdir = os.path.dirname(os.path.abspath(__main__.__file__))
except AttributeError:
pass
if scriptdir is not None:
sys.path = [p for p in sys.path if p != scriptdir]

import base64
import shutil
import zipfile
Expand Down