From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 16 May 2022 00:09:32 +0000 (+0100)
Subject: cli bundle progress: clear before thinking about bundles
X-Git-Tag: otter-1.1.0~87
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5a52d95d927e33e8398c02b2a9a53feacce73787;p=otter.git

cli bundle progress: clear before thinking about bundles

Otherwise the output is a bit messed up.

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

diff --git a/cli/forgame.rs b/cli/forgame.rs
index 7153417f..e8116459 100644
--- a/cli/forgame.rs
+++ b/cli/forgame.rs
@@ -103,6 +103,7 @@ mod reset_game {
         MR::Bundles { bundles } => bundles,
         x => throw!(anyhow!("unexpected response to ListBundles: {:?}",x)),
       };
+      progress.clear();
 
       let bundles_only = args.bundles_only;
       match Itertools::zip_longest(
diff --git a/support/imports.rs b/support/imports.rs
index 2202a7ab..df39193b 100644
--- a/support/imports.rs
+++ b/support/imports.rs
@@ -86,7 +86,7 @@ pub use crate::packetframe::{PacketFrameReadError, PacketFrameWriteError};
 pub use crate::progress::{self, ProgressInfo, OriginatorExt as _};
 pub use crate::slotmap_slot_idx::*;
 pub use crate::support::*;
-pub use crate::termprogress;
+pub use crate::termprogress::{self, Reporter as _};
 pub use crate::timedfd::*;
 pub use crate::toml_de;
 pub use crate::tz::*;