mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
Safeguard against infinite restarts of ngapps in the event that CheckForMismatches fails due to a bad Extensions.rdf file generated by a faulty nightly build.
This commit is contained in:
parent
788530ba16
commit
cd1e371148
@ -1948,10 +1948,16 @@ int xre_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
||||
return 0;
|
||||
}
|
||||
|
||||
char* noEMRestart = PR_GetEnv("NO_EM_RESTART");
|
||||
char* noEMRestart = PR_GetEnv("NO_EM_RESTART");
|
||||
noRestart = noEMRestart && !strcmp("1", noEMRestart);
|
||||
if (!noRestart && upgraded)
|
||||
em->CheckForMismatches(&needsRestart);
|
||||
if (!noRestart && upgraded) {
|
||||
rv = em->CheckForMismatches(&needsRestart);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "Oops, looks like you have a extensions.rdf file generated by a buggy nightly build. Please remove it!");
|
||||
if (NS_FAILED(rv)) {
|
||||
needsRestart = PR_FALSE;
|
||||
upgraded = PR_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
if (noRestart || (!upgraded || !needsRestart))
|
||||
em->Start(componentsListChanged, &needsRestart);
|
||||
|
Loading…
Reference in New Issue
Block a user