From e37bc8eb3fba9d0ac98a7b042925d27bc88a9195 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 05:26:47 +0000
Subject: [PATCH 1/2] Bump indicatif from 0.16.2 to 0.17.0

Bumps [indicatif](https://github.com/console-rs/indicatif) from 0.16.2 to 0.17.0.
- [Release notes](https://github.com/console-rs/indicatif/releases)
- [Commits](https://github.com/console-rs/indicatif/compare/0.16.2...0.17.0)

---
updated-dependencies:
- dependency-name: indicatif
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock         | 7 +++----
 package/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 61d8e3c6827..d11142a265b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2161,15 +2161,14 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.16.2"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
+checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf"
 dependencies = [
  "console",
- "lazy_static",
  "number_prefix",
  "rayon",
- "regex",
+ "unicode-width",
 ]
 
 [[package]]
diff --git a/package/Cargo.toml b/package/Cargo.toml
index 020c9258c0f..5bebdb9892e 100644
--- a/package/Cargo.toml
+++ b/package/Cargo.toml
@@ -10,7 +10,7 @@ anyhow = "1.0"
 clap = { version = "3.2", features = ["derive"] }
 futures = "0.3.23"
 hex = "0.4.3"
-indicatif = { version = "0.16.2", features = ["rayon"] }
+indicatif = { version = "0.17.0", features = ["rayon"] }
 omicron-common = { path = "../common" }
 omicron-sled-agent = { path = "../sled-agent" }
 omicron-zone-package = "0.3.2"

From 3cde2e7c5d934b37e7a4ae75ff0222ccdd69a369 Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Fri, 19 Aug 2022 10:38:43 -0400
Subject: [PATCH 2/2] Okay but make it compile tho

---
 package/src/bin/omicron-package.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/src/bin/omicron-package.rs b/package/src/bin/omicron-package.rs
index 80208a240c0..9d3799d1939 100644
--- a/package/src/bin/omicron-package.rs
+++ b/package/src/bin/omicron-package.rs
@@ -293,7 +293,6 @@ async fn do_package(config: &Config, output_directory: &Path) -> Result<()> {
             },
         );
 
-    tokio::task::spawn_blocking(move || ui.multi.join());
     tokio::try_join!(external_pkg_stream, internal_pkg_stream)?;
 
     Ok(())
@@ -496,12 +495,14 @@ fn in_progress_style() -> ProgressStyle {
         .template(
             "[{elapsed_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7} {msg}",
         )
+        .expect("Invalid template")
         .progress_chars("#>.")
 }
 
 fn completed_progress_style() -> ProgressStyle {
     ProgressStyle::default_bar()
         .template("[{elapsed_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7} {msg:.green}")
+        .expect("Invalid template")
         .progress_chars("#>.")
 }