CMake: bump version

CMakeLists.txt

@@ -176,7 +176,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
 ### Bump version here
 set( CALAMARES_VERSION_MAJOR 3 )
 set( CALAMARES_VERSION_MINOR 1 )
-set( CALAMARES_VERSION_PATCH 12 )
+set( CALAMARES_VERSION_PATCH 13 )
 set( CALAMARES_VERSION_RC 0 )
 
 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )

src/modules/locale/LocaleViewStep.cpp

@@ -122,7 +122,7 @@ LocaleViewStep::fetchGeoIpTimezone()
 
     if ( m_geoipStyle.isEmpty() || m_geoipStyle == "legacy" )
     {
-        actualUrl.append( "/json" );
+        actualUrl.append( "/json/" );
         handler = new FreeGeoIP;
     }
     else if ( m_geoipStyle == "json" )
@@ -141,6 +141,7 @@ LocaleViewStep::fetchGeoIpTimezone()
         setUpPage();
         return;
     }
+    cDebug() << "Fetching GeoIP data from" << actualUrl;
 
     QNetworkAccessManager *manager = new QNetworkAccessManager( this );
     connect( manager, &QNetworkAccessManager::finished,
@@ -151,6 +152,8 @@ LocaleViewStep::fetchGeoIpTimezone()
             auto tz = handler->processReply( reply->readAll() );
             if ( !tz.first.isEmpty() )
                 m_startingTimezone = tz;
+            else
+                cDebug() << "WARNING: GeoIP lookup at" << reply->url() << "failed.";
         }
         delete handler;
         reply->deleteLater();
@@ -159,7 +162,7 @@ LocaleViewStep::fetchGeoIpTimezone()
     } );
 
     QNetworkRequest request;
-    request.setUrl( QUrl::fromUserInput( m_geoipUrl ) );
+    request.setUrl( QUrl::fromUserInput( actualUrl ) );
     request.setAttribute( QNetworkRequest::FollowRedirectsAttribute, true );
     manager->get( request );
 }