Bug 1271775 - shut up eslint warning about return value, rs=bustage FUNNELCAKE86_BRANCH
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 10 Jun 2016 10:11:51 +0100
branchFUNNELCAKE86_BRANCH
changeset 326420 945b06d097611ad4649d6228d1b00fade3ff1251
parent 326419 eeb0cd98062aaf46ca6925c6ba5f70c223b5fdc2
child 326421 1630efb6a2bdf93bc6c5f3754cd6d628022d283f
push id1143
push usernthomas@mozilla.com
push dateTue, 05 Jul 2016 23:40:05 +0000
treeherdermozilla-release@0cc1138c8b72 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1271775
milestone47.0.1
Bug 1271775 - shut up eslint warning about return value, rs=bustage MozReview-Commit-ID: ESoog14WDSw
browser/components/migration/MigrationUtils.jsm
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/browser/components/migration/MigrationUtils.jsm
@@ -696,17 +696,18 @@ this.MigrationUtils = Object.freeze({
     }
 
     let isRefresh = migrator && skipSourcePage &&
                     migratorKey == AppConstants.MOZ_APP_NAME;
 
     if (!isRefresh &&
         Services.prefs.getBoolPref("browser.migration.automigrate")) {
       try {
-        return AutoMigrate.migrate(aProfileStartup, aMigratorKey, aProfileToMigrate);
+        AutoMigrate.migrate(aProfileStartup, aMigratorKey, aProfileToMigrate);
+        return;
       } catch (ex) {
         // If automigration failed, continue and show the dialog.
         Cu.reportError(ex);
       }
     }
 
     let migrationEntryPoint = this.MIGRATION_ENTRYPOINT_FIRSTRUN;
     if (isRefresh) {