keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rust/treefile: Rename arch -> basearch

Browse Source 
We're really using this variable to substitute `${basearch}` and find
basearch-specific packages. Let's rename the variable to make that more
obvious.

Closes: #1766
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2019-02-26 09:37:04 -05:00 committed by Atomic Bot
parent 75f415f09f
commit 6a57db1c36
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
rust/src/treefile.rs
View File

@ -68,12 +68,12 @@ enum InputFormat {
JSON, JSON,
} }
/// Parse a YAML treefile definition using architecture `arch`. /// Parse a YAML treefile definition using base architecture `basearch`.
/// This does not open the externals. /// This does not open the externals.
fn treefile_parse_stream<R: io::Read>( fn treefile_parse_stream<R: io::Read>(
fmt: InputFormat, fmt: InputFormat,
input: &mut R, input: &mut R,
arch: Option<&str>, basearch: Option<&str>,
) -> Fallible<TreeComposeConfig> { ) -> Fallible<TreeComposeConfig> {
let mut treefile: TreeComposeConfig = match fmt { let mut treefile: TreeComposeConfig = match fmt {
InputFormat::YAML => { InputFormat::YAML => {
@ -97,10 +97,10 @@ fn treefile_parse_stream<R: io::Read>(
}; };
// Substitute ${basearch} // Substitute ${basearch}
treefile.treeref = match (arch, treefile.treeref.take()) { treefile.treeref = match (basearch, treefile.treeref.take()) {
(Some(arch), Some(treeref)) => { (Some(basearch), Some(treeref)) => {
let mut varsubsts = HashMap::new(); let mut varsubsts = HashMap::new();
varsubsts.insert("basearch".to_string(), arch.to_string()); varsubsts.insert("basearch".to_string(), basearch.to_string());
Some( Some(
utils::varsubst(&treeref, &varsubsts) utils::varsubst(&treeref, &varsubsts)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?, .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?,
@ -111,7 +111,7 @@ fn treefile_parse_stream<R: io::Read>(
// Special handling for packages, since we allow whitespace within items. // Special handling for packages, since we allow whitespace within items.
// We also canonicalize bootstrap_packages to packages here so it's // We also canonicalize bootstrap_packages to packages here so it's
// easier to append the arch packages after. // easier to append the basearch packages after.
let mut pkgs: Vec<String> = vec![]; let mut pkgs: Vec<String> = vec![];
{ {
if let Some(base_pkgs) = treefile.packages.take() { if let Some(base_pkgs) = treefile.packages.take() {
@ -122,7 +122,7 @@ fn treefile_parse_stream<R: io::Read>(
} }
} }
let arch_pkgs = match arch { let arch_pkgs = match basearch {
Some("aarch64") => treefile.packages_aarch64.take(), Some("aarch64") => treefile.packages_aarch64.take(),
Some("armhfp") => treefile.packages_armhfp.take(), Some("armhfp") => treefile.packages_armhfp.take(),
Some("ppc64") => treefile.packages_ppc64.take(), Some("ppc64") => treefile.packages_ppc64.take(),
@ -164,7 +164,7 @@ fn load_passwd_file<P: AsRef<Path>>(
/// open its external files. /// open its external files.
fn treefile_parse<P: AsRef<Path>>( fn treefile_parse<P: AsRef<Path>>(
filename: P, filename: P,
arch: Option<&str>, basearch: Option<&str>,
) -> Fallible<ConfigAndExternals> { ) -> Fallible<ConfigAndExternals> {
let filename = filename.as_ref(); let filename = filename.as_ref();
let mut f = io::BufReader::new(open_file(filename)?); let mut f = io::BufReader::new(open_file(filename)?);
@ -177,7 +177,7 @@ fn treefile_parse<P: AsRef<Path>>(
} else { } else {
InputFormat::JSON InputFormat::JSON
}; };
let tf = treefile_parse_stream(fmt, &mut f, arch).map_err(|e| { let tf = treefile_parse_stream(fmt, &mut f, basearch).map_err(|e| {
io::Error::new( io::Error::new(
io::ErrorKind::InvalidInput, io::ErrorKind::InvalidInput,
format!("Parsing {}: {}", filename.to_string_lossy(), e.to_string()), format!("Parsing {}: {}", filename.to_string_lossy(), e.to_string()),
@ -302,11 +302,11 @@ fn treefile_merge_externals(dest: &mut TreefileExternals, src: &mut TreefileExte
/// Recursively parse a treefile, merging along the way. /// Recursively parse a treefile, merging along the way.
fn treefile_parse_recurse<P: AsRef<Path>>( fn treefile_parse_recurse<P: AsRef<Path>>(
filename: P, filename: P,
arch: Option<&str>, basearch: Option<&str>,
depth: u32, depth: u32,
) -> Fallible<ConfigAndExternals> { ) -> Fallible<ConfigAndExternals> {
let filename = filename.as_ref(); let filename = filename.as_ref();
let mut parsed = treefile_parse(filename, arch)?; let mut parsed = treefile_parse(filename, basearch)?;
let include_path = parsed.config.include.take(); let include_path = parsed.config.include.take();
if let &Some(ref include_path) = &include_path { if let &Some(ref include_path) = &include_path {
if depth == INCLUDE_MAXDEPTH { if depth == INCLUDE_MAXDEPTH {
@ -317,7 +317,7 @@ fn treefile_parse_recurse<P: AsRef<Path>>(
} }
let parent = filename.parent().unwrap(); let parent = filename.parent().unwrap();
let include_path = parent.join(include_path); let include_path = parent.join(include_path);
let mut included = treefile_parse_recurse(include_path, arch, depth + 1)?; let mut included = treefile_parse_recurse(include_path, basearch, depth + 1)?;
treefile_merge(&mut parsed.config, &mut included.config); treefile_merge(&mut parsed.config, &mut included.config);
treefile_merge_externals(&mut parsed.externals, &mut included.externals); treefile_merge_externals(&mut parsed.externals, &mut included.externals);
} }
@ -340,10 +340,10 @@ impl Treefile {
/// The main treefile creation entrypoint. /// The main treefile creation entrypoint.
fn new_boxed( fn new_boxed(
filename: &Path, filename: &Path,
arch: Option<&str>, basearch: Option<&str>,
workdir: openat::Dir, workdir: openat::Dir,
) -> Fallible<Box<Treefile>> { ) -> Fallible<Box<Treefile>> {
let parsed = treefile_parse_recurse(filename, arch, 0)?; let parsed = treefile_parse_recurse(filename, basearch, 0)?;
Treefile::validate_config(&parsed.config)?; Treefile::validate_config(&parsed.config)?;
let dfd = openat::Dir::open(filename.parent().unwrap())?; let dfd = openat::Dir::open(filename.parent().unwrap())?;
let (rojig_name, rojig_spec) = if let Some(rojig) = parsed.config.rojig.as_ref() { let (rojig_name, rojig_spec) = if let Some(rojig) = parsed.config.rojig.as_ref() {
@ -752,7 +752,7 @@ remove-files:
} }
impl TreefileTest { impl TreefileTest {
fn new<'a, 'b>(contents: &'a str, arch: Option<&'b str>) -> Fallible<TreefileTest> { fn new<'a, 'b>(contents: &'a str, basearch: Option<&'b str>) -> Fallible<TreefileTest> {
let workdir = tempfile::tempdir()?; let workdir = tempfile::tempdir()?;
let tf_path = workdir.path().join("treefile.yaml"); let tf_path = workdir.path().join("treefile.yaml");
{ {
@ -760,7 +760,7 @@ remove-files:
tf_stream.write_all(contents.as_bytes())?; tf_stream.write_all(contents.as_bytes())?;
} }
let tf = let tf =
Treefile::new_boxed(tf_path.as_path(), arch, openat::Dir::open(workdir.path())?)?; Treefile::new_boxed(tf_path.as_path(), basearch, openat::Dir::open(workdir.path())?)?;
Ok(TreefileTest { tf, workdir }) Ok(TreefileTest { tf, workdir })
} }
} }
@ -796,18 +796,18 @@ rojig:
#[test] #[test]
fn test_treefile_merge() { fn test_treefile_merge() {
let arch = Some(ARCH_X86_64); let basearch = Some(ARCH_X86_64);
let mut base_input = io::BufReader::new(VALID_PRELUDE.as_bytes()); let mut base_input = io::BufReader::new(VALID_PRELUDE.as_bytes());
let mut base = treefile_parse_stream(InputFormat::YAML, &mut base_input, arch).unwrap(); let mut base = treefile_parse_stream(InputFormat::YAML, &mut base_input, basearch).unwrap();
let mut mid_input = io::BufReader::new( let mut mid_input = io::BufReader::new(
r###" r###"
packages: packages:
- some layered packages - some layered packages
"###.as_bytes(), "###.as_bytes(),
); );
let mut mid = treefile_parse_stream(InputFormat::YAML, &mut mid_input, arch).unwrap(); let mut mid = treefile_parse_stream(InputFormat::YAML, &mut mid_input, basearch).unwrap();
let mut top_input = io::BufReader::new(ROJIG_YAML.as_bytes()); let mut top_input = io::BufReader::new(ROJIG_YAML.as_bytes());
let mut top = treefile_parse_stream(InputFormat::YAML, &mut top_input, arch).unwrap(); let mut top = treefile_parse_stream(InputFormat::YAML, &mut top_input, basearch).unwrap();
treefile_merge(&mut mid, &mut base); treefile_merge(&mut mid, &mut base);
treefile_merge(&mut top, &mut mid); treefile_merge(&mut top, &mut mid);
let tf = &top; let tf = &top;
@ -849,18 +849,18 @@ mod ffi {
#[no_mangle] #[no_mangle]
pub extern "C" fn ror_treefile_new( pub extern "C" fn ror_treefile_new(
filename: *const libc::c_char, filename: *const libc::c_char,
arch: *const libc::c_char, basearch: *const libc::c_char,
workdir_dfd: libc::c_int, workdir_dfd: libc::c_int,
gerror: *mut *mut glib_sys::GError, gerror: *mut *mut glib_sys::GError,
) -> *mut Treefile { ) -> *mut Treefile {
// Convert arguments // Convert arguments
let filename = ffi_view_os_str(filename); let filename = ffi_view_os_str(filename);
let arch = ffi_view_nullable_str(arch); let basearch = ffi_view_nullable_str(basearch);
let workdir = ffi_view_openat_dir(workdir_dfd); let workdir = ffi_view_openat_dir(workdir_dfd);
// Run code, map error if any, otherwise extract raw pointer, passing // Run code, map error if any, otherwise extract raw pointer, passing
// ownership back to C. // ownership back to C.
ptr_glib_error( ptr_glib_error(
Treefile::new_boxed(filename.as_ref(), arch, workdir), Treefile::new_boxed(filename.as_ref(), basearch, workdir),
gerror, gerror,
) )
} }