update_engine: clean up blocked words.
Remove blocked words from update engine.
BUG=b:182413423
TEST=/src/platform/dev/contrib/search_blocked_words.sh
Disallow-Recycled-Builds: test-failures
Change-Id: I980749019399861d3550c855e20db7f1756d6585
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2892255
Tested-by: Vyshu Khota <vyshu@google.com>
Commit-Queue: Vyshu Khota <vyshu@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
diff --git a/README.md b/README.md
index 71f271b..8a7564e 100644
--- a/README.md
+++ b/README.md
@@ -614,29 +614,29 @@
[Postinstall]: #postinstall
[update payload file specification]: #update-payload-file-specification
[OTA]: https://source.android.com/devices/tech/ota
-[DLC]: https://chromium.googlesource.com/chromiumos/platform2/+/master/dlcservice
-[`chromeos-setgoodkernel`]: https://chromium.googlesource.com/chromiumos/platform2/+/master/installer/chromeos-setgoodkernel
+[DLC]: https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/dlcservice
+[`chromeos-setgoodkernel`]: https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/installer/chromeos-setgoodkernel
[D-Bus interface]: /dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml
[this repository]: /
[UpdateManager]: /update_manager/update_manager.cc
[update_manager]: /update_manager/
-[P2P update related code]: https://chromium.googlesource.com/chromiumos/platform2/+/master/p2p/
-[`cros_generate_update_payloads`]: https://chromium.googlesource.com/chromiumos/chromite/+/master/scripts/cros_generate_update_payload.py
-[`chromite/lib/paygen`]: https://chromium.googlesource.com/chromiumos/chromite/+/master/lib/paygen/
+[P2P update related code]: https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/p2p/
+[`cros_generate_update_payloads`]: https://chromium.googlesource.com/chromiumos/chromite/+/HEAD/scripts/cros_generate_update_payload.py
+[`chromite/lib/paygen`]: https://chromium.googlesource.com/chromiumos/chromite/+/HEAD/lib/paygen/
[DeltaArchiveManifest]: /update_metadata.proto#302
[Signatures]: /update_metadata.proto#122
[hard coded]: /update_engine.conf
[Manifest protobuf]: /update_metadata.proto
[update_payload]: /scripts/
-[Postinstall]: https://chromium.googlesource.com/chromiumos/platform2/+/master/installer/chromeos-postinst
-[`update_engine` protobufs]: https://chromium.googlesource.com/chromiumos/platform2/+/master/system_api/dbus/update_engine/
-[Running unit tests similar to other platforms]: https://chromium.googlesource.com/chromiumos/docs/+/master/testing/running_unit_tests.md
-[Nebraska]: https://chromium.googlesource.com/chromiumos/platform/dev-util/+/master/nebraska/
+[Postinstall]: https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/installer/chromeos-postinst
+[`update_engine` protobufs]: https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/system_api/dbus/update_engine/
+[Running unit tests similar to other platforms]: https://chromium.googlesource.com/chromiumos/docs/+/HEAD/testing/running_unit_tests.md
+[Nebraska]: https://chromium.googlesource.com/chromiumos/platform/dev-util/+/HEAD/nebraska/
[upstream branch]: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/upstream
-[`cros flash`]: https://chromium.googlesource.com/chromiumos/docs/+/master/cros_flash.md
-[bsdiff]: https://android.googlesource.com/platform/external/bsdiff/+/master
-[puffin]: https://android.googlesource.com/platform/external/puffin/+/master
+[`cros flash`]: https://chromium.googlesource.com/chromiumos/docs/+/HEAD/cros_flash.md
+[bsdiff]: https://android.googlesource.com/platform/external/bsdiff/+/HEAD
+[puffin]: https://android.googlesource.com/platform/external/puffin/+/HEAD
[`update_engine_client`]: /update_engine_client.cc
[`brillo_update_payload`]: /scripts/brillo_update_payload
[`check_update_payload`]: /scripts/paycheck.py
-[Dev Server]: https://chromium.googlesource.com/chromiumos/chromite/+/master/docs/devserver.md
+[Dev Server]: https://chromium.googlesource.com/chromiumos/chromite/+/HEAD/docs/devserver.md
diff --git a/common/mock_action_processor.h b/common/mock_action_processor.h
index 9785776..7b40fdb 100644
--- a/common/mock_action_processor.h
+++ b/common/mock_action_processor.h
@@ -35,7 +35,7 @@
MOCK_METHOD2(ActionComplete, void(AbstractAction*, ErrorCode));
// This is a legacy workaround described in:
- // https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#legacy-workarounds-for-move-only-types-legacymoveonly
+ // https://github.com/google/googletest/blob/HEAD/docs/gmock_cook_book.md#legacy-workarounds-for-move-only-types-legacymoveonly
void EnqueueAction(std::unique_ptr<AbstractAction> action) override {
EnqueueAction(action.get());
}
diff --git a/pylintrc b/pylintrc
index a433868..9cfc4d3 100644
--- a/pylintrc
+++ b/pylintrc
@@ -42,11 +42,6 @@
# active Python interpreter and may run arbitrary code.
unsafe-load-any-extension=no
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=
-
# Allow optimization of some AST trees. This will activate a peephole AST
# optimizer, which will apply various small optimizations. For instance, it can
# be used to obtain the result of joining multiple strings with the addition
diff --git a/scripts/update_payload/applier.py b/scripts/update_payload/applier.py
index 29ccb8e..f1efd0b 100644
--- a/scripts/update_payload/applier.py
+++ b/scripts/update_payload/applier.py
@@ -596,7 +596,7 @@
part_names = set(new_part_info.keys()) # Equivalently, old_part_info.keys()
- # Make sure the arguments are sane and match the payload.
+ # Make sure the arguments make sense and match the payload.
new_part_names = set(new_parts.keys())
if new_part_names != part_names:
raise PayloadError('missing dst partition(s) %s' %
diff --git a/unblocked_terms.txt b/unblocked_terms.txt
index a0ba6d7..4ab2fb4 100644
--- a/unblocked_terms.txt
+++ b/unblocked_terms.txt
@@ -3,33 +3,6 @@
#
# See repohooks/README.md for more details.
-black.?hat
-black.?list
-build.?cop
-crazy
-cripple
dummy
-first.?class.?citizen
-grandfathered
-gr[ae]y.?hat
-gr[ae]y.?list
-\bhe\b
-\bshe\b
-\bhim\b
-\bher\b
-\bhis\b
-\bhers\b
-man.?in.?the.?middle
-mastero
-\bmitm(\b|\d)
+master
\bnative
-\bred.?line
-rtfm
-\b(in)?sane(\b|\d)
-sanity
-slave
-white.?glove
-white.?hat
-white.?label
-white.?list
-\bwtf