mirror of
https://github.com/morgan9e/helium
synced 2026-04-15 00:44:06 +09:00
merge: update to ungoogled-chromium 138.0.7204.157
This commit is contained in:
@@ -1 +1 @@
|
||||
138.0.7204.100
|
||||
138.0.7204.157
|
||||
|
||||
@@ -930,7 +930,7 @@
|
||||
"//chrome/browser/search/background",
|
||||
"//chrome/browser/search/background:constants",
|
||||
"//chrome/browser/search_engine_choice:unit_tests",
|
||||
@@ -8413,7 +8405,6 @@ test("unit_tests") {
|
||||
@@ -8414,7 +8406,6 @@ test("unit_tests") {
|
||||
"//components/webapps/browser",
|
||||
"//services/metrics/public/cpp:ukm_builders",
|
||||
"//services/network:test_support",
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/format_macros.h"
|
||||
#include "base/functional/bind.h"
|
||||
@@ -566,6 +567,15 @@ AutocompleteController::AutocompleteCont
|
||||
@@ -568,6 +569,15 @@ AutocompleteController::AutocompleteCont
|
||||
steady_state_omnibox_position_(
|
||||
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
|
||||
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
|
||||
|
||||
@@ -96,7 +96,7 @@ def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to):
|
||||
output_dir / relative_to)
|
||||
raise FileExistsError()
|
||||
cmd1 = (binary, 'x', str(archive_path), '-so')
|
||||
cmd2 = (binary, 'x', '-si', '-aoa', '-ttar', f'-o{str(output_dir)}')
|
||||
cmd2 = (binary, 'x', '-si', '-snld', '-aoa', '-ttar', f'-o{str(output_dir)}')
|
||||
get_logger().debug('7z command line: %s | %s', ' '.join(cmd1), ' '.join(cmd2))
|
||||
|
||||
proc1 = subprocess.Popen(cmd1, stdout=subprocess.PIPE) #pylint: disable=consider-using-with
|
||||
|
||||
Reference in New Issue
Block a user