Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
osgeo4w: don't pickup PATH changes by GRASS' env.bat (fixes #38476)
  • Loading branch information
jef-n committed Sep 25, 2020
1 parent 04ae0ca commit 04fbe17
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ms-windows/osgeo4w/qgis-grass.bat.tmpl
Expand Up @@ -2,9 +2,10 @@
call "%~dp0\o4w_env.bat"
call qt5_env.bat
call py3_env.bat
set savedpath=%PATH%
call "%OSGEO4W_ROOT%\apps\grass\@grasspath@\etc\env.bat"
@echo off
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\@grasspath@\lib;%OSGEO4W_ROOT%\apps\grass\@grasspath@\bin;%PATH%
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\@grasspath@\lib;%OSGEO4W_ROOT%\apps\grass\@grasspath@\bin;%savedpath%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
set GDAL_FILENAME_IS_UTF8=YES
rem Set VSI cache to be used as buffer, see #6448
Expand Down

3 comments on commit 04fbe17

@Houska1
Copy link
Contributor

Choose a reason for hiding this comment

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

Great, hopefully this will fix this ongoing bugbear. Should it be backported to 3.14 and 3.10 LTR?

@agiudiceandrea
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @jef-n, could this patch be backported to 3.10 branch if @Houska1 can confirm that it fixes the issue?

@Houska1
Copy link
Contributor

Choose a reason for hiding this comment

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

@agiudiceandrea , issue did not resurface when I installed 3.15-dev a few weeks ago, and 3.16 last week. So I think issue is fixed. Thanks!

Please sign in to comment.