[locale] Remove old-style GeoIP configuration

main
Adriaan de Groot 5 years ago
parent 5a24e45e3b
commit 0ee8427d5a

@ -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) #

@ -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.";
}
}

Loading…
Cancel
Save