From 04f2233c6c8a503147105af86ad447f70d33ec71 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 25 Jan 2013 18:30:23 +0100 Subject: 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." (cherry picked from commit 67d23e3a99bbaaa5a4dff1f8f3a10bd8abd198fb) Conflicts: desktop/source/migration/migration.cxx Change-Id: I8dd50a36450c167d47411834cc06a754affadf6d Reviewed-on: https://gerrit.libreoffice.org/1867 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- desktop/source/migration/migration.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 1b4115af805c..f56fd2425955 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -169,7 +169,7 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; bool MigrationImpl::alreadyMigrated() { - rtl::OUString MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM("/MIGRATED")); + rtl::OUString MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM("/MIGRATED4")); rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME; File aFile(aStr); // create migration stamp, and/or check its existence -- cgit v1.2.3