diff options
| -rw-r--r-- | autotests/test_kconf_update.cpp | 9 | ||||
| -rw-r--r-- | src/kconf_update/README.kconf_update | 5 | ||||
| -rw-r--r-- | src/kconf_update/kconf_update.cpp | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp index e4e2b416..ff4939a3 100644 --- a/autotests/test_kconf_update.cpp +++ b/autotests/test_kconf_update.cpp @@ -262,7 +262,7 @@ void TestKConfUpdate::test_data() << true << true ; - QTest::newRow("DontMigrateWhenFileDoesntHaveVersion") + QTest::newRow("MigrateWhenFileDoesntHaveVersion") << "File=testrc\n" "Group=group\n" @@ -276,12 +276,15 @@ void TestKConfUpdate::test_data() << "testrc" << + "[$Version]\n" + "update_info=%1\n" + "\n" "[group]\n" - "old=value\n" + "new=value\n" << "" << false - << false + << true ; QTest::newRow("DontMigrateWhenUpdateCantDoItMissingFilename") diff --git a/src/kconf_update/README.kconf_update b/src/kconf_update/README.kconf_update index 72509286..cff2625e 100644 --- a/src/kconf_update/README.kconf_update +++ b/src/kconf_update/README.kconf_update @@ -51,8 +51,9 @@ Commas (,) are used to seperate fields and may not occur as part of any field and all of the keywords are case-sensitive, i.e. you cannot say "key" instead of "Key" for example. -Starting from KDE Frameworks 5 make sure to put Version=5 before the first "Id=" otherwise the upd file -will be skipped and the config file will not be updated. +Starting in KDE Frameworks 5, all update files should have a version field +at the top of the file. Thus all files should start with the line Version=5. +Files without a version are currently treated as version 5 but are deprecated. For the rest the file is parsed and executed sequentially from top to bottom. Each line can contain one entry. The following entries are recognized: 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) { |