From b39f3ce4075e01a087e41a8821267bbfa0d7fae2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 10 May 2021 01:22:11 +0100
Subject: [PATCH] Revert "bundles: Save aux after incorporating"

Actually we don't need this because InstanceBundles is recreated on
load from the directory contents.

This reverts commit 36da462250abad1db53bada2face99e046061041.
---
 src/bundles.rs | 3 +--
 src/global.rs  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/bundles.rs b/src/bundles.rs
index e2f7f9eb..fab48e7a 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -569,14 +569,13 @@ impl Uploading {
 
 impl InstanceBundles {
   #[throws(MgmtError)]
-  pub fn finish_upload(&mut self, ig: &mut InstanceGuard,
+  pub fn finish_upload(&mut self, ig: &mut Instance,
                        Uploaded { id, parsed }: Uploaded) {
     let tmp = id.path_tmp(&ig.name);
     let install = id.path_(&ig.name);
 
     incorporate_bundle(self, ig, id, parsed)?;
 
-    ig.save_aux_now()?;
     self.updated(ig);
     match self.bundles.get(usize::from(id.index)) {
       Some(Some(Note { state: State::Loaded(..), .. })) => {
diff --git a/src/global.rs b/src/global.rs
index 23bbd9a7..c24ac09e 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -1043,7 +1043,7 @@ impl InstanceGuard<'_> {
   }
 
   #[throws(InternalError)]
-  pub fn save_aux_now(&mut self) {
+  fn save_aux_now(&mut self) {
     self.save_something("a-", |s, w| {
       let ipieces = &s.c.g.ipieces;
       let ioccults = &s.c.g.ioccults;
-- 
2.30.2