summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-01-25 18:30:23 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-01-25 18:30:23 +0100
commit67d23e3a99bbaaa5a4dff1f8f3a10bd8abd198fb (patch)
tree6dbdedc0b4c3b5f9f0bada1426880decaa6ade15
parente2250ec113e5534875e7480f5bf508d71fa46f4d (diff)
fdo#57061: Use a new MIGRATION4 flag file for profile migration LO 3 -> 4
...to avoid missing migrations on Windows and Mac OS X, where existing "3" user profiles got the "MIGRATED" flag file erroneously added when running LO 3 already, presumably due to 6b522673373797bbf53d795d53e0ec45175a5d67 "default config location has changed, look in old config dir when migrating." Change-Id: I8dd50a36450c167d47411834cc06a754affadf6d
-rw-r--r--desktop/source/migration/migration.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 9005d20f9bbb..62aba3d157b9 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -172,7 +172,7 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
bool MigrationImpl::alreadyMigrated()
{
- rtl::OUString MIGRATION_STAMP_NAME("/MIGRATED");
+ rtl::OUString MIGRATION_STAMP_NAME("/MIGRATED4");
rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME;
File aFile(aStr);
// create migration stamp, and/or check its existence