github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-22 04:18:53 +00:00
Code Issues Projects Releases Wiki Activity

versions: update rust version

Browse Source 
Fixes #4764

versions: update rust version to fix ccv0 attestation-agent build error
static-checks: kata tools, libs, and agent fixes

Signed-Off-By: Ryan Savino <ryan.savino@amd.com>
This commit is contained in:
Ryan Savino
2022-07-28 14:08:33 -05:00
committed by Ryan Savino
parent 0aefab4d80
commit 9b1940e93e
8 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/agent-ctl/src/main.rs
View File

@@ -163,7 +163,7 @@ fn connect(name: &str, global_args: clap::ArgMatches) -> Result<()> {
let (logger, _guard) = logging::create_logger(name, crate_name!(), log_level, writer);
let timeout_nano: i64 = match args.value_of("timeout") {
Some(t) => utils::human_time_to_ns(t).map_err(|e| e)?,
Some(t) => utils::human_time_to_ns(t)?,
None => 0,
};

2
src/tools/agent-ctl/src/utils.rs
View File

@@ -688,7 +688,7 @@ fn oci_to_ttrpc(bundle_dir: &str, cid: &str, oci: &ociSpec) -> Result<ttrpcSpec>
let root = match &oci.root {
Some(r) => {
let ttrpc_root = root_oci_to_ttrpc(bundle_dir, r).map_err(|e| e)?;
let ttrpc_root = root_oci_to_ttrpc(bundle_dir, r)?;
protobuf::SingularPtrField::some(ttrpc_root)
}