Merge pull request #224 from peterablehmann/main

Fix describe_node_list remaining nodes special case
zhaofengli · Oct 7, 2024 · b0a62f2 · b0a62f2
2 parents 0fca61a + 569c914
commit b0a62f2
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/job.rs b/src/job.rs
@@ -874,11 +874,17 @@ fn describe_node_list(nodes: &[NodeName]) -> Option<String> {
         }
 
         let (idx, next) = next.unwrap();
-        let remaining = rough_limit - s.len();
+        let remaining_text = rough_limit - s.len();
+        let remaining_nodes = total - idx;
 
-        if next.len() + other_text.len() >= remaining {
-            write!(s, ", and {} other nodes", total - idx).unwrap();
-            break;
+        if next.len() + other_text.len() >= remaining_text {
+            if remaining_nodes == 1 {
+                write!(s, ", and {}", next.as_str()).unwrap();
+                break;
+            } else {
+                write!(s, ", and {} other nodes", remaining_nodes).unwrap();
+                break;
+            }
         }
     }