Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1867

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/1867/1

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
---
M desktop/source/migration/migration.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 1b4115a..f56fd24 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -169,7 +169,7 @@
 
 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

-- 
To view, visit https://gerrit.libreoffice.org/1867
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dd50a36450c167d47411834cc06a754affadf6d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman@redhat.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.