summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--migrationutility/main.cpp2
-rw-r--r--migrationutility/migrateuserjob.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/migrationutility/main.cpp b/migrationutility/main.cpp
index 6b02260..8913295 100644
--- a/migrationutility/main.cpp
+++ b/migrationutility/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
options.add("dry", ki18n("Dry run, doesn't change anything on the server, but only prints what would be done (Use with care until this is well tested)."));
options.add("wipeTargetFolders", ki18n("Wipe and recreate target folders (Will only wipe folders in the personal namespace which are existing on the source server)."));
options.add("statefile", ki18n("Resume from migration-state file"), "/tmp/kolabmigration.state");
- options.add("skipFolder <regex>", ki18n("List of regex for source-folders to skip."));
+ options.add("skipFolder <sourcefolder>", ki18n("Source-folders to skip. Uses a simple \"contains\"-filter."));
options.add("from <type>", ki18n("Source host type (kolab2, kolab3, exchangeimap, google)"));
diff --git a/migrationutility/migrateuserjob.cpp b/migrationutility/migrateuserjob.cpp
index 43dd587..3b894a9 100644
--- a/migrationutility/migrateuserjob.cpp
+++ b/migrationutility/migrateuserjob.cpp
@@ -137,8 +137,7 @@ void MigrateUserJob::onFolderMigrated(KJob *job)
bool MigrateUserJob::isIgnored(const QString &sourceFolder) const
{
foreach (const QString &ignoredFolder, mCurrentSourceAccount->ignoredFolders()) {
- const QRegExp reg(ignoredFolder, Qt::CaseSensitive, QRegExp::RegExp2);
- if (reg.exactMatch(sourceFolder)) {
+ if (sourceFolder.contains(ignoredFolder)) {
return true;
}
}