From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 May 2021 11:42:04 +0000 (+0100)
Subject: bundles: Pass &InstanceName to parse_bundle
X-Git-Tag: otter-0.6.0~329
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1e63f2fbeb3de59eb5e9883515724624276887e9;p=otter.git

bundles: Pass &InstanceName to parse_bundle

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

diff --git a/src/bundles.rs b/src/bundles.rs
index 436865a0..6f0f51e8 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -416,7 +416,7 @@ impl BundleParseErrorHandling for BundleParseUpload {
 }
 
 #[throws(EH::Err)]
-fn parse_bundle<EH>(id: Id, file: File, eh: EH,
+fn parse_bundle<EH>(id: Id, _instance_name: &InstanceName, file: File, eh: EH,
                     mut for_progress: &mut dyn progress::Reporter)
                     -> (ForProcess, Parsed)
   where EH: BundleParseErrorHandling,
@@ -556,7 +556,7 @@ impl InstanceBundles {
       }
 
       let eh = BundleParseReload { bpath: fpath };
-      let (_za, parsed) = match parse_bundle(id, file, eh, &mut ()) {
+      let (_za, parsed) = match parse_bundle(id, &ig.name, file, eh, &mut ()) {
         Ok(y) => y,
         Err(e) => {
           debug!("bundle file {:?} reload failed {}", &fpath, e);
@@ -633,7 +633,7 @@ impl Uploading {
 
     file.rewind().context("rewind"). map_err(IE::from)?;
 
-    let (za, parsed) = parse_bundle(id, file, BundleParseUpload,
+    let (za, parsed) = parse_bundle(id, &instance, file, BundleParseUpload,
                               &mut for_progress)?;
 
     process_bundle(za, id, &*instance, &mut for_progress)?;