Skip to content

configure: don't clobber existing $PYTHONPATH #509

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

Merged
TooTallNate merged 1 commit into from
May 24, 2015
Merged

configure: don't clobber existing $PYTHONPATH #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/configure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,9 @@ function configure (gyp, argv, callback) {
argv.unshift(gyp_script)

// make sure python uses files that came with this particular node package
process.env.PYTHONPATH = path.resolve(__dirname, '..', 'gyp', 'pylib')
var pypath = process.env.PYTHONPATH ? [process.env.PYTHONPATH] : []
Copy link
Copy Markdown
Contributor

@TooTallNate TooTallNate Nov 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Funnily enough, this would be a good use-case for my path-array module.

Copy link
Copy Markdown
Contributor Author

@timbertson timbertson Nov 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, if you don't mind the extra dependency just for these couple of lines - I didn't know about that module. Want me to redo the PR, or are you happy to do that since you're presumably pretty familiar with it?

pypath.unshift(path.resolve(__dirname, '..', 'gyp', 'pylib'))
process.env.PYTHONPATH = pypath.join(process.platform === "win32" ? ";" : ":");

var cp = gyp.spawn(python, argv)
cp.on('exit', onCpExit)
Expand Down