applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'issue-1540' into calamares

Browse source 
FIXES #1540
This commit is contained in:
Adriaan de Groot 2020-10-16 13:56:52 +02:00
commit d63e23b289
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libcalamares/geoip/Handler.cpp
View file

@ -113,7 +113,9 @@ do_query( Handler::Type type, const QString& url, const QString& selector )
return RegionZonePair();
}
return interface->processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( url ) );
using namespace CalamaresUtils::Network;
return interface->processReply(
CalamaresUtils::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) );
}
static QString
@ -125,7 +127,9 @@ do_raw_query( Handler::Type type, const QString& url, const QString& selector )
return QString();
}
return interface->rawReply( CalamaresUtils::Network::Manager::instance().synchronousGet( url ) );
using namespace CalamaresUtils::Network;
return interface->rawReply(
CalamaresUtils::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) );
}
RegionZonePair

8
src/libcalamares/geoip/test_geoip.cpp
View file

@ -11,7 +11,6 @@
* This is a test-application that does one GeoIP parse.
*/
#include <iostream>
#include "GeoIPFixed.h"
#include "GeoIPJSON.h"
@ -19,6 +18,10 @@
#include "GeoIPXML.h"
#endif
#include "utils/Logger.h"
#include <iostream>
using std::cerr;
using namespace CalamaresUtils::GeoIP;
@ -34,6 +37,9 @@ main( int argc, char** argv )
QString format( argv[ 1 ] );
QString selector = argc == 3 ? QString( argv[ 2 ] ) : QString();
Logger::setupLogLevel(Logger::LOGVERBOSE);
cDebug() << "Doing GeoIP interpretation with format=" << format << "selector=" << selector;
Interface* handler = nullptr;
if ( QStringLiteral( "json" ) == format )
{

3
src/libcalamares/network/Manager.cpp
View file

@ -223,6 +223,7 @@ synchronousRun( QNetworkAccessManager* nam, const QUrl& url, const RequestOption
auto* reply = asynchronousRun( nam, url, options );
if ( !reply )
{
cDebug() << "Could not create request for" << url;
return qMakePair( RequestStatus( RequestStatus::Failed ), nullptr );
}
@ -232,10 +233,12 @@ synchronousRun( QNetworkAccessManager* nam, const QUrl& url, const RequestOption
reply->deleteLater();
if ( reply->isRunning() )
{
cDebug() << "Timeout on request for" << url;
return qMakePair( RequestStatus( RequestStatus::Timeout ), nullptr );
}
else if ( reply->error() != QNetworkReply::NoError )
{
cDebug() << "HTTP error" << reply->error() << "on request for" << url;
return qMakePair( RequestStatus( RequestStatus::HttpError ), nullptr );
}
else