diff options
author | Niels Weber <niels.2.weber@nokia.com> | 2012-04-26 14:16:31 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-04-27 11:43:53 +0200 |
commit | 32b8b1c99d064a77e5be963eb8da37c81dd73387 (patch) | |
tree | 3c64ec07a2c37733103aae6f81eadc3de5dfec2a /src/sdk | |
parent | 5236d1a186661d7373063dfd606bd822b29754d7 (diff) |
remove allowMaintenanceTool check
Change-Id: Ibb6d0757137bef2e381030d2b6baf5f2460d3439
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/sdk')
-rw-r--r-- | src/sdk/installerbase.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 87c16ee45..e8d32d673 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -85,24 +85,6 @@ static QSet<Repository> repositories(const QStringList &arguments, const int ind return set; } -static bool allowMaintenanceTool() -{ - try { - Settings m_settings = Settings(Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), - QLatin1String(":/metadata/installer-config/"))); - - if (m_settings.value(QLatin1String("AllowExecuteMaintenanceTool"), QLatin1String("true")).toString().toLower() - == QLatin1String("true")) - { - return true; - } - } catch (const Error &e) { - qWarning("Could not parse Config: %s", qPrintable(e.message())); - return true; - } - return false; -} - // -- main int main(int argc, char *argv[]) @@ -260,17 +242,6 @@ int main(int argc, char *argv[]) // instantiate the installer we are actually going to use QInstaller::PackageManagerCore core(content.magicMarker(), content.performedOperations()); - Settings m_settings = - Settings(Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), - QLatin1String(":/metadata/installer-config/"))); - - // check execution rights for the maintenance tool - if (!core.isInstaller() && !allowMaintenanceTool() && !args.contains(QLatin1String("--script"))) { - QString reason = m_settings.value(QLatin1String("DisallowExecuteReason"), - QString::fromLatin1("You are not allowed to run %1.").arg(qAppName())).toString(); - QMessageBox::information(0, QLatin1String("Update notification"), reason); - return 0; - } if (QInstaller::isVerbose()) { qDebug() << "Resource tree after loading the in-binary resource:"; |