diff options
| author | Ben Caimano <ben.caimano@10gen.com> | 2019-08-15 11:22:03 -0400 |
|---|---|---|
| committer | Ben Caimano <ben.caimano@10gen.com> | 2019-08-15 11:41:59 -0400 |
| commit | 518e705de5b362ce49520981125a2ec9a71e1754 (patch) | |
| tree | b606273e6f584d0509192a8c85d9e251f6434c24 | |
| parent | e01bb51154d87a0b9931a63a444b4fdb20b8f530 (diff) | |
| download | mongo-518e705de5b362ce49520981125a2ec9a71e1754.tar.gz | |
SERVER-42709 SERVER-42178 Lint fixup
| -rw-r--r-- | .pylintrc | 3 | ||||
| -rw-r--r-- | jstests/ssl/repl_ssl_split_horizon.js | 3 | ||||
| -rw-r--r-- | src/mongo/db/repair_database_and_check_version.cpp | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.pylintrc b/.pylintrc index 7bd38008874..9784ddd8105 100644 --- a/.pylintrc +++ b/.pylintrc @@ -23,3 +23,6 @@ variable-rgx=[a-z_][a-z0-9_]{1,50}$ # W0611 - unused-import - typing module is needed for mypy disable=bad-continuation,fixme,import-error,line-too-long,no-member,locally-disabled,redefined-variable-type,too-few-public-methods,unused-import + +[IMPORTS] +known-third-party=boto3,botocore,psutil,yaml diff --git a/jstests/ssl/repl_ssl_split_horizon.js b/jstests/ssl/repl_ssl_split_horizon.js index b49c9b50e81..4061560d3d1 100644 --- a/jstests/ssl/repl_ssl_split_horizon.js +++ b/jstests/ssl/repl_ssl_split_horizon.js @@ -41,7 +41,8 @@ version is ${glibc_version}, skipping this test.`); return; } else { - var verCheck = runProgram("grep", "/etc/os-release", "\"SUSE Linux Enterprise Server\""); + var verCheck = + runProgram("grep", "/etc/os-release", "\"SUSE Linux Enterprise Server\""); if (verCheck == 0) { jsTestLog(`HOSTALIASES does not seem to work as expected but we detected SLES. GLIBC version is ${glibc_version}, skipping this test.`); diff --git a/src/mongo/db/repair_database_and_check_version.cpp b/src/mongo/db/repair_database_and_check_version.cpp index 51f6f77146b..e455e355ad3 100644 --- a/src/mongo/db/repair_database_and_check_version.cpp +++ b/src/mongo/db/repair_database_and_check_version.cpp @@ -193,7 +193,8 @@ Status ensureAllCollectionsHaveUUIDs(OperationContext* opCtx, return { ErrorCodes::MustDowngrade, str::stream() - << "Collection " << coll->ns().ns() + << "Collection " + << coll->ns().ns() << " is missing an UUID. We expect all collections to have UUIDs starting " "in FCV 3.6. Please make sure the FCV is version 3.6 before attempting " "an upgrade to 4.0; see " |