napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[locale] Log GeoIP attempt URL, use possibly-modified form

Browse Source
This commit is contained in:
Adriaan de Groot 2018-04-13 09:42:28 -04:00
parent be5ad6944e
commit faf21ce438
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/locale/LocaleViewStep.cpp
View File

@ -122,7 +122,7 @@ LocaleViewStep::fetchGeoIpTimezone()
if ( m_geoipStyle.isEmpty() || m_geoipStyle == "legacy" ) if ( m_geoipStyle.isEmpty() || m_geoipStyle == "legacy" )
{ {
actualUrl.append( "/json" ); actualUrl.append( "/json/" );
handler = new FreeGeoIP; handler = new FreeGeoIP;
} }
else if ( m_geoipStyle == "json" ) else if ( m_geoipStyle == "json" )
@ -141,6 +141,7 @@ LocaleViewStep::fetchGeoIpTimezone()
setUpPage(); setUpPage();
return; return;
} }
cDebug() << "Fetching GeoIP data from" << actualUrl;
QNetworkAccessManager *manager = new QNetworkAccessManager( this ); QNetworkAccessManager *manager = new QNetworkAccessManager( this );
connect( manager, &QNetworkAccessManager::finished, connect( manager, &QNetworkAccessManager::finished,
@ -161,7 +162,7 @@ LocaleViewStep::fetchGeoIpTimezone()
} ); } );
QNetworkRequest request; QNetworkRequest request;
request.setUrl( QUrl::fromUserInput( m_geoipUrl ) ); request.setUrl( QUrl::fromUserInput( actualUrl ) );
request.setAttribute( QNetworkRequest::FollowRedirectsAttribute, true ); request.setAttribute( QNetworkRequest::FollowRedirectsAttribute, true );
manager->get( request ); manager->get( request );
} }