Skip to content

Commit

Permalink
Merge pull request bpfman#1155 from anfredette/set_name_change
Browse files Browse the repository at this point in the history
Temporary work-around for multi-program container images
  • Loading branch information
mergify[bot] authored Jun 12, 2024
2 parents 2dd57ca + b3cadc8 commit d58d5eb
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions bpfman/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use std::{
use aya::programs::ProgramInfo as AyaProgInfo;
use chrono::{prelude::DateTime, Local};
use clap::ValueEnum;
use log::{info, warn};
use log::{debug, info, warn};
use rand::Rng;
use serde::{Deserialize, Serialize};
use sled::Db;
Expand Down Expand Up @@ -628,10 +628,11 @@ impl ProgramData {
if provided_name.is_empty() {
self.set_name(&s)?;
} else if s != provided_name {
return Err(BpfmanError::BytecodeMetaDataMismatch {
image_prog_name: s,
provided_prog_name: provided_name.to_string(),
});
debug!(
"Bytecode image bpf function name: {} isn't equal to the provided bpf function name: {}",
s,
provided_name
);
}
}
Location::File(l) => {
Expand Down

0 comments on commit d58d5eb

Please sign in to comment.