From 508dc64f5fec5c14d8a7f32e900f786c0b48ca92 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 10 May 2021 01:04:41 +0100
Subject: [PATCH] bundles: Use ReloadError for reload

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/bundles.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bundles.rs b/src/bundles.rs
index c4d5c639..3e84ffb6 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -475,13 +475,12 @@ impl InstanceBundles {
         ib.bundles.resize_with(iu+1, default);
       }
 
-      let parsed = match parse_bundle(id, &mut file, fpath) {
+      let parsed = match parse_bundle::<ReloadError>(id, &mut file, fpath) {
         Ok(y) => y,
-        Err(LE::BadBundle(why)) => {
-          debug!("bundle file {:?} bad {}", &fpath, why);
+        Err(e) => {
+          debug!("bundle file {:?} reload failed {}", &fpath, e);
           continue;
         }
-        Err(LE::IE(ie)) => throw!(ie),
       };
 
       incorporate_bundle(&mut ib, ig, id, parsed)?;
-- 
2.30.2