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

[libcalamares] Warn about badly-configured GeoIP

Browse Source 
- Warn when type will be none
 - Re-order warnings from general to specific
This commit is contained in:
Adriaan de Groot 2019-06-18 12:33:56 +02:00
parent 3967f6c5ae
commit 68dc1f5e31
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcalamares/geoip/Handler.cpp
View File

@ -64,17 +64,21 @@ Handler::Handler( const QString& implementation, const QString& url, const QStri
{ {
bool ok = false; bool ok = false;
m_type = handlerTypes().find( implementation, ok ); m_type = handlerTypes().find( implementation, ok );
#if !defined(QT_XML_LIB)
if ( m_type == Type::XML )
{
m_type = Type::None;
cWarning() << "GeoIP style XML is not supported in this version of Calamares.";
}
#endif
if ( !ok ) if ( !ok )
{ {
cWarning() << "GeoIP Style" << implementation << "is not recognized."; cWarning() << "GeoIP style" << implementation << "is not recognized.";
} }
else if ( m_type == Type::None )
{
cWarning() << "GeoIP style *none* does not do anything.";
}
#if !defined(QT_XML_LIB)
else if ( m_type == Type::XML )
{
m_type = Type::None;
cWarning() << "GeoIP style *xml* is not supported in this version of Calamares.";
}
#endif
} }
Handler::~Handler() Handler::~Handler()