From c78ad98742f18ea7ebcdc218b4229ebe1fbf570e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 30 Nov 2009 14:48:50 +0000 Subject: [PATCH] Monotone-Parent: 3ec2e0f99bbf37c3d347f65454edef902b376d18 Monotone-Revision: 3c3f676520d5f154730079c576d8ffde515851cd Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-11-30T14:48:50 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/SOGo/SOGoDefaultsSource.m | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaf5fd943..f182314d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-30 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoDefaultsSource.m + (-migrateOldDefaultsWithDictionary:): when migrating between two + existing keys, the migration is not interrupted if both values are + the same. + 2009-11-29 Wolfgang Sourdeau * SoObjects/SOGo/SOGoUserManager.m diff --git a/SoObjects/SOGo/SOGoDefaultsSource.m b/SoObjects/SOGo/SOGoDefaultsSource.m index 2769af252..c12086769 100644 --- a/SoObjects/SOGo/SOGoDefaultsSource.m +++ b/SoObjects/SOGo/SOGoDefaultsSource.m @@ -213,9 +213,10 @@ NSString *SOGoDefaultsSourceUnmutableSource = @"SOGoDefaultsSourceUnmutableSourc { newName = [migratedKeys objectForKey: oldName]; existingValue = [source objectForKey: newName]; - if (existingValue) + if (existingValue && ![existingValue isEqual: currentValue]) [self errorWithFormat: @"both old and new defaults key" - @" '%@' '%@' exist. Migration skipped.", oldName, newName]; + @" ('%@' and '%@') exist with a different value." + @" Migration skipped.", oldName, newName]; else { requireSync = YES;