diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-03-28 15:55:45 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-03-29 08:20:00 +0000 |
| commit | aa72378d1806b95944b68174b23f4a53f6ffb92e (patch) | |
| tree | a569474eb9f88cb4d6ffa9736bd30eb35da16467 | |
| parent | 1b892e8653965d13cc7b30101b414585dc70143e (diff) | |
Make missing installation locations in the config file non-fatal
Change-Id: I9092bf5cb60fb9e0ff3e47fe7ce798674ebfc068
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
| -rw-r--r-- | src/installer-lib/installationlocation.cpp | 4 | ||||
| -rw-r--r-- | src/main-lib/main.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/installer-lib/installationlocation.cpp b/src/installer-lib/installationlocation.cpp index ac4f876c..ca44a5a6 100644 --- a/src/installer-lib/installationlocation.cpp +++ b/src/installer-lib/installationlocation.cpp @@ -274,10 +274,6 @@ QVector<InstallationLocation> InstallationLocation::parseInstallationLocations(c throw Exception(Error::Parse, "could not parse the installation location with id %1").arg(id); } } - - if (locations.isEmpty()) - throw Exception(Error::Parse, "no installation locations defined in config file"); - return locations; } diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp index 856e7e45..707b6986 100644 --- a/src/main-lib/main.cpp +++ b/src/main-lib/main.cpp @@ -395,6 +395,8 @@ void Main::setupInstallationLocations(const QVariantList &installationLocations) { m_installationLocations = InstallationLocation::parseInstallationLocations(installationLocations, hardwareId()); + if (m_installationLocations.isEmpty()) + qCWarning(LogDeployment) << "No installation locations defined in config file"; } void Main::loadApplicationDatabase(const QString &databasePath, bool recreateDatabase, |