Commit 51a54d25 authored by Alexander Lohnau's avatar Alexander Lohnau 💬
Browse files

Deprecate ChecksumPolicy and SignaturePolicy properties

These properties are never read and the consequently
the feature does not exist anymore.
Adding checksum verification is still a TODO, but
having defunct properties does not help with that.

And if this gets reimplemented I see no valid reason
why one wants to disable it.
parent 3e8020b0
......@@ -148,23 +148,10 @@ bool Installation::readConfig(const KConfigGroup &group)
}
}
}
#endif
installPath = group.readEntry("InstallPath");
absoluteInstallPath = group.readEntry("AbsoluteInstallPath");
acceptHtml = group.readEntry("AcceptHtmlDownloads", false);
if (standardResourceDirectory.isEmpty() &&
targetDirectory.isEmpty() &&
xdgTargetDirectory.isEmpty() &&
installPath.isEmpty() &&
absoluteInstallPath.isEmpty()) {
qCCritical(KNEWSTUFFCORE) << "No installation target set";
return false;
}
QString checksumpolicy = group.readEntry("ChecksumPolicy");
if (!checksumpolicy.isEmpty()) {
qWarning(KNEWSTUFFCORE) << "The ChecksumPolicy feature is defunct";
if (checksumpolicy == QLatin1String("never")) {
checksumPolicy = Installation::CheckNever;
} else if (checksumpolicy == QLatin1String("ifpossible")) {
......@@ -179,6 +166,7 @@ bool Installation::readConfig(const KConfigGroup &group)
QString signaturepolicy = group.readEntry("SignaturePolicy");
if (!signaturepolicy.isEmpty()) {
qWarning(KNEWSTUFFCORE) << "The SignaturePolicy feature is defunct";
if (signaturepolicy == QLatin1String("never")) {
signaturePolicy = Installation::CheckNever;
} else if (signaturepolicy == QLatin1String("ifpossible")) {
......@@ -190,6 +178,20 @@ bool Installation::readConfig(const KConfigGroup &group)
return false;
}
}
#endif
installPath = group.readEntry("InstallPath");
absoluteInstallPath = group.readEntry("AbsoluteInstallPath");
acceptHtml = group.readEntry("AcceptHtmlDownloads", false);
if (standardResourceDirectory.isEmpty() &&
targetDirectory.isEmpty() &&
xdgTargetDirectory.isEmpty() &&
installPath.isEmpty() &&
absoluteInstallPath.isEmpty()) {
qCCritical(KNEWSTUFFCORE) << "No installation target set";
return false;
}
return true;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment