From 10e459d02ff3a8c76b053ba31381e643a4434782 Mon Sep 17 00:00:00 2001 From: Matthew Dawson Date: Sat, 14 Feb 2015 14:55:54 -0500 Subject: Revert "Revert the SIC in commit 915976c1238be811f169eab1b02f7e8dad6410e0." This reverts commit 9eee15917e01a89d937d1cba2eebbe9d65daeb72. As agreed with David Faure, we are going to leave this change in place for 5.7 and see what happens. CCMAIL: faure@kde.org CHANGELOG: Reverts previous commit, both can be left out of the changelog. --- src/kconf_update/kconf_update.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/kconf_update/kconf_update.cpp') diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp index dc16409e..309bc3c2 100644 --- a/src/kconf_update/kconf_update.cpp +++ b/src/kconf_update/kconf_update.cpp @@ -252,7 +252,8 @@ bool KonfUpdate::checkFile(const QString &filename) } if (line.startsWith("Id=")) { if (!foundVersion) { - qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped in the future.").arg(filename); + qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped.").arg(filename); + return true; } id = m_currentFilename + ':' + line.mid(3); } else if (line.startsWith("File=")) { @@ -335,7 +336,8 @@ bool KonfUpdate::updateFile(const QString &filename) } if (m_line.startsWith(QLatin1String("Id="))) { if (!foundVersion) { - qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped in the future.").arg(filename); + qDebug() << QStringLiteral("Missing \"Version=5\", file \'%1\' will be skipped.").arg(filename); + break; } gotId(m_line.mid(3)); } else if (m_skip) { -- cgit v1.2.1