StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "feat: show if flag is locally overridden" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-19 14:09:41 +00:00
committed by Gerrit Code Review
parent d9fc22aeda 05fea28d9c
commit ca4c83efa3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aconfig/aflags/src/aconfig_storage_source.rs
View File

@@ -65,7 +65,9 @@ fn reconcile(
} else { } else {
FlagPermission::ReadOnly FlagPermission::ReadOnly
}; };
let value_picked_from = if Some(value) == default_value { let value_picked_from = if listed_flag.has_local_override {
ValuePickedFrom::Local
} else if Some(value) == default_value {
ValuePickedFrom::Default ValuePickedFrom::Default
} else { } else {
ValuePickedFrom::Server ValuePickedFrom::Server

2
tools/aconfig/aflags/src/main.rs
View File

@@ -50,6 +50,7 @@ impl std::fmt::Display for FlagPermission {
enum ValuePickedFrom { enum ValuePickedFrom {
Default, Default,
Server, Server,
Local,
} }
impl std::fmt::Display for ValuePickedFrom { impl std::fmt::Display for ValuePickedFrom {
@@ -60,6 +61,7 @@ impl std::fmt::Display for ValuePickedFrom {
match &self { match &self {
Self::Default => "default", Self::Default => "default",
Self::Server => "server", Self::Server => "server",
Self::Local => "local",
} }
) )
} }