haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not migrate the versioned env variables 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/6914
This commit is contained in:
Jon Evans 2021-01-02 10:47:06 -05:00
parent eba7cb222c
commit decca8baba
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/settings/common_settings.cpp
View File

@ -18,6 +18,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <set>
#include <settings/common_settings.h> #include <settings/common_settings.h>
#include <settings/parameters.h> #include <settings/parameters.h>
#include <view/view_controls.h> #include <view/view_controls.h>
@ -28,6 +29,16 @@
using KIGFX::MOUSE_DRAG_ACTION; using KIGFX::MOUSE_DRAG_ACTION;
///! The following environment variables will never be migrated from a previous version
const std::set<wxString> envVarBlacklist =
{
wxT( "KICAD6_SYMBOL_DIR" ),
wxT( "KICAD6_FOOTPRINT_DIR" ),
wxT( "KICAD6_TEMPLATES_DIR" ),
wxT( "KICAD6_3DMODEL_DIR" )
};
///! Update the schema version whenever a migration is required ///! Update the schema version whenever a migration is required
const int commonSchemaVersion = 1; const int commonSchemaVersion = 1;
@ -250,6 +261,12 @@ bool COMMON_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
while( aCfg->GetNextEntry( key, index ) ) while( aCfg->GetNextEntry( key, index ) )
{ {
if( envVarBlacklist.count( key ) )
{
wxLogTrace( traceSettings, "Migrate Env: %s is blacklisted; skipping.", key );
continue;
}
value = aCfg->Read( key, wxEmptyString ); value = aCfg->Read( key, wxEmptyString );
if( !value.IsEmpty() ) if( !value.IsEmpty() )