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.

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

proj_info().searchpath should not include PROJ_LIB path #1498

Merged
merged 1 commit into from Jun 4, 2019

Conversation

@nyalldawson
Copy link
Contributor

commented Jun 2, 2019

... if the context search_paths is not empty

The logic used when actually searching for files is that if
the context search_paths are set, these completely override
the PROJ_LIB variable. So we should make proj_info().searchpath
correctly reflect this, and not include the PROJ_LIB path
in searchpath if the context has search_paths manually set.

Refs qgis/QGIS#30048

proj_info().searchpath should not include PROJ_LIB path if
the context search_paths is not empty

The logic used when actually searching for files is that if
the context search_paths are set, these completely override
the PROJ_LIB variable. So we should make proj_info().searchpath
correctly reflect this, and not include the PROJ_LIB path
in searchpath if the context has search_paths manually set.

@nyalldawson nyalldawson force-pushed the nyalldawson:fix_searchpath_logic branch from 575a397 to e7c8fb8 Jun 2, 2019

@kbevers kbevers added the backport 6.1 label Jun 4, 2019

@kbevers kbevers added this to the 6.1.1 milestone Jun 4, 2019

@kbevers kbevers merged commit c50ef87 into OSGeo:master Jun 4, 2019

4 checks passed

FreeBSD Task Summary
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage decreased (-0.008%) to 85.899%
Details
@kbevers

This comment has been minimized.

Copy link
Member

commented Jun 4, 2019

Thanks for noticing and fixing this :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.