From 0ee8427d5a310a568263f1493d573b888b28661a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 7 Sep 2019 16:05:09 +0200 Subject: [PATCH] [locale] Remove old-style GeoIP configuration --- CHANGES | 3 +++ src/modules/locale/LocaleViewStep.cpp | 16 ---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index ad985b1e4..b3a1da805 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,9 @@ This release contains contributions from (alphabetically by first name): ## Modules ## + - *locale* module no longer recognized the legacy GeoIP configuration. + This has been deprecated since Calamares 3.2.8. + # 3.2.13 (2019-08-30) # diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp index 9dbcb5993..5d9d2df71 100644 --- a/src/modules/locale/LocaleViewStep.cpp +++ b/src/modules/locale/LocaleViewStep.cpp @@ -231,20 +231,4 @@ LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap ) m_geoipStyle = CalamaresUtils::getString( geoip, "style" ); m_geoipSelector = CalamaresUtils::getString( geoip, "selector" ); } - else - { - // Accommodate deprecated geoip configuration - m_geoipUrl = CalamaresUtils::getString( configurationMap, "geoipUrl" ); - m_geoipStyle = CalamaresUtils::getString( configurationMap, "geoipStyle" ); - m_geoipSelector = CalamaresUtils::getString( configurationMap, "geoipSelector" ); - - if ( !m_geoipUrl.isEmpty() && ( m_geoipStyle.isEmpty() || m_geoipStyle == "legacy" ) ) - { - m_geoipStyle = "json"; - m_geoipUrl.append( "/json/" ); - } - - if ( !m_geoipUrl.isEmpty() ) - cWarning() << "Legacy-style GeoIP configuration is deprecated. Use geoip: map."; - } }