Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d91c7bab authored by Ted Bauer's avatar Ted Bauer Committed by Gerrit Code Review
Browse files

Merge "aflags: Check for existence of container when filtering" into main

parents 49a6b383 cd82659f

tools/aconfig/aflags/src/load_protos.rs

+7 −0
Original line number Diff line number Diff line
@@ -60,3 +60,10 @@ pub(crate) fn load() -> Result<Vec<Flag>> { 
    }

    Ok(result)

}



pub(crate) fn list_containers() -> Result<Vec<String>> {

    Ok(aconfig_device_paths::parsed_flags_proto_paths()?

        .into_iter()

        .map(|p| infer_container(&p))

        .collect())

}

tools/aconfig/aflags/src/main.rs

+9 −1
Original line number Diff line number Diff line
@@ -253,6 +253,14 @@ fn list(source_type: FlagSourceType, container: Option<String>) -> Result<String 
        FlagSourceType::DeviceConfig => DeviceConfigSource::list_flags()?,

        FlagSourceType::AconfigStorage => AconfigStorageSource::list_flags()?,

    };



    if let Some(ref c) = container {

        ensure!(

            load_protos::list_containers()?.contains(c),

            format!("container '{}' not found", &c)

        );

    }



    let flags = (Filter { container }).apply(&flags_unfiltered);

    let padding_info = PaddingInfo {

        longest_flag_col: flags.iter().map(|f| f.qualified_name().len()).max().unwrap_or(0),
@@ -298,7 +306,7 @@ fn main() -> Result<()> { 
        Command::List { container } => {

            if aconfig_flags::auto_generated::enable_only_new_storage() {

                list(FlagSourceType::AconfigStorage, container)

                    .map_err(|err| anyhow!("storage may not be enabled: {err}"))

                    .map_err(|err| anyhow!("could not list flags: {err}"))

                    .map(Some)

            } else {

                list(FlagSourceType::DeviceConfig, container).map(Some)