aboutsummaryrefslogtreecommitdiff
path: root/src/kconf_update/kconf_update.cpp
diff options
context:
space:
mode:
authorMatthew Dawson <matthew@mjdsystems.ca>2015-02-14 01:15:55 -0500
committerMatthew Dawson <matthew@mjdsystems.ca>2015-02-14 01:15:55 -0500
commit9eee15917e01a89d937d1cba2eebbe9d65daeb72 (patch)
treed7d2310424e50815f2e287e641c2a1027550b2e1 /src/kconf_update/kconf_update.cpp
parent28ddbf8138c865e19e8836b49af74f9d3bc20401 (diff)
downloadkconfig-9eee15917e01a89d937d1cba2eebbe9d65daeb72.tar.gz
kconfig-9eee15917e01a89d937d1cba2eebbe9d65daeb72.tar.bz2
Revert the SIC in commit 915976c1238be811f169eab1b02f7e8dad6410e0.
On further reflection, introducing a SIC to fix the bug is not ideal. I'm working on something that will address the underlying bug, but I didn't have it in time for 5.7. The versioning behaviour is left, as I do want it to exist for the future. This only reverts the mandatory versioning of files to avoid the compatibility break. CHANGELOG: Undo 915976c123, which never saw a release, enough to avoid the SIC.
Diffstat (limited to 'src/kconf_update/kconf_update.cpp')
-rw-r--r--src/kconf_update/kconf_update.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index 309bc3c2..dc16409e 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -252,8 +252,7 @@ bool KonfUpdate::checkFile(const QString &filename)
}
if (line.startsWith("Id=")) {
if (!foundVersion) {
- qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped.").arg(filename);
- return true;
+ qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped in the future.").arg(filename);
}
id = m_currentFilename + ':' + line.mid(3);
} else if (line.startsWith("File=")) {
@@ -336,8 +335,7 @@ bool KonfUpdate::updateFile(const QString &filename)
}
if (m_line.startsWith(QLatin1String("Id="))) {
if (!foundVersion) {
- qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped.").arg(filename);
- break;
+ qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped in the future.").arg(filename);
}
gotId(m_line.mid(3));
} else if (m_skip) {