Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Fix layout show to not show changes when there are no changes #297

Merged
lx merged 2 commits from fix-layout-show into main 2022-05-09 09:14:55 +00:00
Conversation 0 Commits 2 Files changed 2 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 798b447720 - Show all commits

4
src/garage/cli/layout.rs
View file

@ -335,14 +335,14 @@ pub fn print_staging_role_changes(layout: &ClusterLayout) -> bool {
.staging .staging
.items() .items()
.iter() .iter()
.any(|(k, _, v)| layout.roles.get(&k) != Some(v)); .any(|(k, _, v)| layout.roles.get(k) != Some(v));
if has_changes { if has_changes {
println!(); println!();
println!("==== STAGED ROLE CHANGES ===="); println!("==== STAGED ROLE CHANGES ====");
let mut table = vec!["ID\tTags\tZone\tCapacity".to_string()]; let mut table = vec!["ID\tTags\tZone\tCapacity".to_string()];
for (id, _, role) in layout.staging.items().iter() { for (id, _, role) in layout.staging.items().iter() {
if layout.roles.get(&id) == Some(role) { if layout.roles.get(id) == Some(role) {
continue; continue;
} }
if let Some(role) = &role.0 { if let Some(role) = &role.0 {