537525 - Profile importer should not treat error as fatal when reading from Windows registry

Status: RESOLVED FIXED

(SeaMonkey :: Startup & Profiles, defect)

Description

[Frank Wein [:mcsmurf]]

Currently the SeaMonkey profile importer for SeaMonkey 1.x and Thunderbird profile just aborts migration when it cannot read the registry key HKLM\\SOFTWARE\\Classes\\HTTP\\shell\\open\\command, see http://hg.mozilla.org/comm-central/annotate/20c2d9e8e9b4/suite/profile/migration/src/nsProfileMigrator.cpp#l180. I spoke to some user where migration failed due to that. I'm not yet sure why this registry key was missing (he had Firefox set as default browser, but is also using SeaMonkey 1.x), but I think this one should not be fatal for profile migration. After all we could jump in this case to http://hg.mozilla.org/comm-central/annotate/20c2d9e8e9b4/suite/profile/migration/src/nsProfileMigrator.cpp#l266:
// We can't get the default migrator (either wrong OS or we don't have a
// migrator for the default browser), so fall back to finding a valid
// profile to migrator manually - first try what we've been given.

Comment 1

[Frank Wein [:mcsmurf]]

Attachment: Patch

I could not really work out how I can get hg qdiff to ignore all whitespace changes (I tested with -w, did not work), basically I changed FAILED->SUCCEEEDED and the else case could be to continue in the block below.

Comment 2

[Frank Wein [:mcsmurf]]

Actually ignore the whitespace changes comment, it did ignore the whitespace changes :)

Comment 3

[Mark Banner (:standard8)]

Comment on attachment 419795 [details] [diff] [review]
Patch

The general idea looks fine, but can you attach a normal patch so that I can assess the whitespace changes, as what's indicated in this patch is just weird.

Comment 4

[Frank Wein [:mcsmurf]]

Attachment: Patch with whitespace changes

Comment 5

[Mark Banner (:standard8)]

Comment on attachment 425537 [details] [diff] [review]
Patch with whitespace changes

That's better, using my own version of diffw its much clearer :-)

r=Standard8

Comment 6

[Frank Wein [:mcsmurf]]

Comment on attachment 425537 [details] [diff] [review]
Patch with whitespace changes

Risk: Will change how SeaMonkey 1.1.18 profile importer will behave when a certain registry key is not found. Might help people who have problems with profile import on Windows.

Comment 7

[Robert Kaiser]

Frank, please check in on 1.9.1 ASAP so we can start 2.0.3 builds. Thanks.

Comment 8

[Frank Wein [:mcsmurf]]

Pushed to 1.9.1: http://hg.mozilla.org/releases/comm-1.9.1/rev/39e6436e83fc

Will push to comm-central when the tree is green again

Comment 9

[Philip Chee]

Ping Frank, time to push to comm-central?

Comment 10

[Frank Wein [:mcsmurf]]

http://hg.mozilla.org/comm-central/rev/47d93faea82a