Skip to content

Commit 764f49c

Browse files
committed
nydus-image: merge main branch and remove unnecessary output
1 parent 00ce305 commit 764f49c

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/bin/nydus-image/main.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -780,10 +780,9 @@ fn main() -> Result<()> {
780780
Command::create(matches, &build_info)
781781
} else if let Some(matches) = cmd.subcommand_matches("chunkdict") {
782782
match matches.subcommand_name() {
783-
Some("generate") => Command::chunkdict_generate(
784-
matches.subcommand_matches("generate").unwrap(),
785-
&build_info,
786-
),
783+
Some("generate") => {
784+
Command::chunkdict_generate(matches.subcommand_matches("generate").unwrap())
785+
}
787786
_ => {
788787
println!("{}", usage);
789788
Ok(())
@@ -1202,7 +1201,7 @@ impl Command {
12021201
OutputSerializer::dump(matches, build_output, build_info, compressor, version)
12031202
}
12041203

1205-
fn chunkdict_generate(matches: &ArgMatches, build_info: &BuildTimeInfo) -> Result<()> {
1204+
fn chunkdict_generate(matches: &ArgMatches) -> Result<()> {
12061205
let mut build_ctx = BuildContext {
12071206
prefetch: Self::get_prefetch(matches)?,
12081207
..Default::default()
@@ -1337,14 +1336,14 @@ impl Command {
13371336
let bootstrap_path = Self::get_bootstrap_storage(matches)?;
13381337
let mut bootstrap_mgr = BootstrapManager::new(Some(bootstrap_path), None);
13391338

1340-
let output = Generator::generate(
1339+
Generator::generate(
13411340
&mut build_ctx,
13421341
&mut bootstrap_mgr,
13431342
&mut blob_mgr,
13441343
chunkdict_chunks,
13451344
chunkdict_blobs,
13461345
)?;
1347-
OutputSerializer::dump(matches, output, build_info).unwrap();
1346+
// OutputSerializer::dump(matches, output, build_info).unwrap();
13481347
info!(
13491348
"Chunkdict metadata is saved at: {:?}",
13501349
matches

0 commit comments

Comments
 (0)