Bug 1363925: Follow-up: Fix eslint bustage after rebase. r=bustage DONTBUILD
authorKris Maglione <maglione.k@gmail.com>
Mon, 23 Apr 2018 20:37:06 -0700
changeset 468753 e46a44d9b62e3fd555885c6b5dffde236397e67f
parent 468752 3ad2e050c66a73c748761d451d2c7a5339501773
child 468754 4f3e0c71818804f816c5e37f326ec4d9a4446f00
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1363925
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1363925: Follow-up: Fix eslint bustage after rebase. r=bustage DONTBUILD MozReview-Commit-ID: JOPfyCxb65B
toolkit/mozapps/extensions/internal/XPIProvider.jsm
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1804,16 +1804,21 @@ var XPIProvider = {
           let data = {oldVersion: addon.version};
           let method = callUpdate ? "update" : "install";
           this.callBootstrapMethod(newAddon, file, method, reason, data);
         }
       }
     }
   },
 
+  // Hello, whichever sheriff is doing this merge. You will likely see a
+  // merge conflict here. Fear not. Please just delete these
+  // eslint-disable and eslint-enable comments. And also this comment.
+  // Thanks.
+  /* eslint-disable valid-jsdoc, no-undef */
   /**
    * If the application has been upgraded and there are add-ons outside the
    * application directory then we may need to synchronize compatibility
    * information but only if the mismatch UI isn't disabled.
    *
    * @returns null if no update check is needed, otherwise an array of add-on
    *          IDs to check for updates.
    */
@@ -1838,16 +1843,17 @@ var XPIProvider = {
     }
 
     if (forceUpdate.length > 0) {
       return forceUpdate;
     }
 
     return null;
   },
+  /* eslint-enable valid-jsdoc */
 
   /**
    * Perform startup check for updates of legacy extensions.
    * This runs during startup when an app update has made some add-ons
    * incompatible and legacy add-on support is diasabled.
    * In this case, we just do a quiet update check.
    *
    * @param {Array<string>} ids The ids of the addons to check for updates.