bundles: clear: When unexpected leftover stuff, print it

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bundles.rs b/src/bundles.rs
index f3b464224ce3b78a73b1cbc3798fa05ed39e2814..fcb39f76c7cb34a6c5f0e9a6a37f6a4240f4d7a9 100644 (file)
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -911,14 +911,21 @@ impl InstanceBundles {
   pub fn clear(&mut self, ig: &mut Instance) {
 
     // Check we are not in bundle state USED
-    for (m, ok) in [
-      ( "pieces",            ig.gs.pieces.is_empty()  ),
-      ( "pieces - occults",  ig.gs.occults.is_empty() ),
-      ( "pieces - ipieces",  ig.ipieces.is_empty()    ),
-      ( "piece aliases",     ig.pcaliases.is_empty()  ),
-      ( "pieces - ioccults", ig.ioccults.is_empty()   ),
-    ] {
-      if ! ok { throw!(ME::BundlesInUse(m.to_string())) }
+    let checks: &[(_,_, Option<&dyn Debug>)] = &[
+      ( "pieces",            ig.gs.pieces.is_empty(),  None  ),
+      ( "piece aliases",     ig.pcaliases.is_empty(),  None  ),
+      ( "pieces - occults",  ig.gs.occults.is_empty(), Some(&ig.gs.occults) ),
+      ( "pieces - ipieces",  ig.ipieces.is_empty(),    Some(&ig.ipieces   ) ),
+      ( "pieces - ioccults", ig.ioccults.is_empty(),   Some(&ig.ioccults  ) ),
+    ];
+    for (m, ok, pr) in checks {
+      if ! ok {
+        if let Some(pr) = pr {
+          error!("{}: failed to clear because leftover {}: {:?}",
+                 &ig.name, m, pr);
+        }
+        throw!(ME::BundlesInUse(m.to_string()))
+      }
     }
 
     // If we are in UNUSED, become BROKEN