Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 2 insertions, 11 deletions

diff --git a/taskcluster/docker/periodic-updates/.eslintrc.js b/taskcluster/docker/periodic-updates/.eslintrc.js
index ecaf80d033..508b1cfbce 100644
--- a/taskcluster/docker/periodic-updates/.eslintrc.js
+++ b/taskcluster/docker/periodic-updates/.eslintrc.js
@@ -14,9 +14,6 @@ module.exports = {
     // Enforce return statements in callbacks of array methods.
     "array-callback-return": "error",
 
-    // Verify calls of super() in constructors.
-    "constructor-super": "error",
-
     // Require default case in switch statements.
     "default-case": "error",
 
@@ -27,9 +24,6 @@ module.exports = {
     // case/default clauses.
     "no-case-declarations": "error",
 
-    // Disallow use of the console API.
-    "no-console": "error",
-
     // Disallow constant expressions in conditions (except for loops).
     "no-constant-condition": ["error", { checkLoops: false }],
 
@@ -48,9 +42,6 @@ module.exports = {
     // No expressions where a statement is expected
     "no-unused-expressions": "error",
 
-    // Disallow unnecessary escape usage in strings and regular expressions.
-    "no-useless-escape": "error",
-
     // Require "use strict" to be defined globally in the script.
     strict: ["error", "global"],
 
diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
index c5b9c78f6f..f01f5cd9c3 100755
--- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
+++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
@@ -322,7 +322,7 @@ function compare_remote_settings_files {
 
     # 5. Download attachments if needed.
     if [ "${bucket}" = "blocklists" ] && [ "${collection}" = "addons-bloomfilters" ]; then
-      # Find the attachment with the most recent generation_time, like _updateMLBF in Blocklist.jsm.
+      # Find the attachment with the most recent generation_time, like _updateMLBF in Blocklist.sys.mjs.
       # The server should return one "bloomfilter-base" record, but in case it returns multiple,
       # return the most recent one. The server may send multiple entries if we ever decide to use
       # the "filter_expression" feature of Remote Settings to send different records to specific
@@ -364,7 +364,7 @@ function update_remote_settings_attachment() {
   # $4 is a jq filter on the arrays that should return one record with the attachment
   local jq_attachment_selector=".data | map(select(.attachment)) | $4"
 
-  # These paths match _readAttachmentDump in services/settings/Attachments.jsm.
+  # These paths match _readAttachmentDump in services/settings/Attachments.sys.mjs.
   local path_to_attachment="${bucket}/${collection}/${attachment_id}"
   local path_to_meta="${bucket}/${collection}/${attachment_id}.meta.json"
   local old_meta="$REMOTE_SETTINGS_INPUT/${path_to_meta}"