代码拉取完成,页面将自动刷新
同步操作将从 src-openEuler/firefox 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
Temporary hack to allow us to directly apply diff of matoko's branch. Disable
rust-vet to skip auditing third party libs in order to download/vendor rust
deps on non-git firefox src. Skip some style checks, as
macroassembler support in js/src/jit/ is not complete yet
diff --git a/python/mozbuild/mozbuild/vendor/vendor_rust.py b/python/mozbuild/mozbuild/vendor/vendor_rust.py
index bc9a9727ae..8cfdba4add 100644
--- a/python/mozbuild/mozbuild/vendor/vendor_rust.py
+++ b/python/mozbuild/mozbuild/vendor/vendor_rust.py
@@ -747,96 +747,96 @@ license file's hash.
failed = True
# Only emit warnings for cargo-vet for now.
- env = os.environ.copy()
- env["PATH"] = os.pathsep.join(
- (
- str(Path(cargo).parent),
- os.environ["PATH"],
- )
- )
- flags = ["--output-format=json"]
- if "MOZ_AUTOMATION" in os.environ:
- flags.append("--locked")
- flags.append("--frozen")
- res = cargo_vet(
- self,
- flags,
- stdout=subprocess.PIPE,
- env=env,
- )
- if res.returncode:
- vet = json.loads(res.stdout)
- logged_error = False
- for failure in vet.get("failures", []):
- failure["crate"] = failure.pop("name")
- self.log(
- logging.ERROR,
- "cargo_vet_failed",
- failure,
- "Missing audit for {crate}:{version} (requires {missing_criteria})."
- " Run `./mach cargo vet` for more information.",
- )
- logged_error = True
- # NOTE: This could log more information, but the violation JSON
- # output isn't super stable yet, so it's probably simpler to tell
- # the caller to run `./mach cargo vet` directly.
- for key in vet.get("violations", {}).keys():
- self.log(
- logging.ERROR,
- "cargo_vet_failed",
- {"key": key},
- "Violation conflict for {key}. Run `./mach cargo vet` for more information.",
- )
- logged_error = True
- if "error" in vet:
- # NOTE: The error format produced by cargo-vet is from the
- # `miette` crate, and can include a lot of metadata and context.
- # If we want to show more details in the future, we can expand
- # this rendering to also include things like source labels and
- # related error metadata.
- error = vet["error"]
- self.log(
- logging.ERROR,
- "cargo_vet_failed",
- error,
- "Vet {severity}: {message}",
- )
- if "help" in error:
- self.log(logging.INFO, "cargo_vet_failed", error, " help: {help}")
- for cause in error.get("causes", []):
- self.log(
- logging.INFO,
- "cargo_vet_failed",
- {"cause": cause},
- " cause: {cause}",
- )
- for related in error.get("related", []):
- self.log(
- logging.INFO,
- "cargo_vet_failed",
- related,
- " related {severity}: {message}",
- )
- self.log(
- logging.INFO,
- "cargo_vet_failed",
- {},
- "Run `./mach cargo vet` for more information.",
- )
- logged_error = True
- if not logged_error:
- self.log(
- logging.ERROR,
- "cargo_vet_failed",
- {},
- "Unknown vet error. Run `./mach cargo vet` for more information.",
- )
- failed = True
-
- # If we failed when checking the crates list and/or running `cargo vet`,
- # stop before invoking `cargo vendor`.
- if failed:
- return False
+ # env = os.environ.copy()
+ # env["PATH"] = os.pathsep.join(
+ # (
+ # str(Path(cargo).parent),
+ # os.environ["PATH"],
+ # )
+ # )
+ # flags = ["--output-format=json"]
+ # if "MOZ_AUTOMATION" in os.environ:
+ # flags.append("--locked")
+ # flags.append("--frozen")
+ # res = cargo_vet(
+ # self,
+ # flags,
+ # stdout=subprocess.PIPE,
+ # env=env,
+ # )
+ # if res.returncode:
+ # vet = json.loads(res.stdout)
+ # logged_error = False
+ # for failure in vet.get("failures", []):
+ # failure["crate"] = failure.pop("name")
+ # self.log(
+ # logging.ERROR,
+ # "cargo_vet_failed",
+ # failure,
+ # "Missing audit for {crate}:{version} (requires {missing_criteria})."
+ # " Run `./mach cargo vet` for more information.",
+ # )
+ # logged_error = True
+ # # NOTE: This could log more information, but the violation JSON
+ # # output isn't super stable yet, so it's probably simpler to tell
+ # # the caller to run `./mach cargo vet` directly.
+ # for key in vet.get("violations", {}).keys():
+ # self.log(
+ # logging.ERROR,
+ # "cargo_vet_failed",
+ # {"key": key},
+ # "Violation conflict for {key}. Run `./mach cargo vet` for more information.",
+ # )
+ # logged_error = True
+ # if "error" in vet:
+ # # NOTE: The error format produced by cargo-vet is from the
+ # # `miette` crate, and can include a lot of metadata and context.
+ # # If we want to show more details in the future, we can expand
+ # # this rendering to also include things like source labels and
+ # # related error metadata.
+ # error = vet["error"]
+ # self.log(
+ # logging.ERROR,
+ # "cargo_vet_failed",
+ # error,
+ # "Vet {severity}: {message}",
+ # )
+ # if "help" in error:
+ # self.log(logging.INFO, "cargo_vet_failed", error, " help: {help}")
+ # for cause in error.get("causes", []):
+ # self.log(
+ # logging.INFO,
+ # "cargo_vet_failed",
+ # {"cause": cause},
+ # " cause: {cause}",
+ # )
+ # for related in error.get("related", []):
+ # self.log(
+ # logging.INFO,
+ # "cargo_vet_failed",
+ # related,
+ # " related {severity}: {message}",
+ # )
+ # self.log(
+ # logging.INFO,
+ # "cargo_vet_failed",
+ # {},
+ # "Run `./mach cargo vet` for more information.",
+ # )
+ # logged_error = True
+ # if not logged_error:
+ # self.log(
+ # logging.ERROR,
+ # "cargo_vet_failed",
+ # {},
+ # "Unknown vet error. Run `./mach cargo vet` for more information.",
+ # )
+ # failed = True
+
+ # # If we failed when checking the crates list and/or running `cargo vet`,
+ # # stop before invoking `cargo vendor`.
+ # if failed:
+ # return False
res = subprocess.run(
[cargo, "vendor", vendor_dir], cwd=self.topsrcdir, stdout=subprocess.PIPE
@@ -913,7 +913,8 @@ license file's hash.
directory=replace["directory"],
)
)
-
+ return True
+
if not self._check_licenses(vendor_dir):
self.log(
logging.ERROR,
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。