From 5c2564477e17da8555b7f0c5e2dbea4e9d19fd3f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 27 Sep 2021 15:28:33 -0600
Subject: [PATCH] fix locker issues

---
 appmgr/src/action/mod.rs  | 14 ++++++++++----
 appmgr/src/manager/mod.rs |  6 ++++--
 appmgr/src/status/mod.rs  |  2 ++
 patch-db                  |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/appmgr/src/action/mod.rs b/appmgr/src/action/mod.rs
index 4ddd40794..d4a1e375f 100644
--- a/appmgr/src/action/mod.rs
+++ b/appmgr/src/action/mod.rs
@@ -13,7 +13,9 @@ use crate::config::{Config, ConfigSpec};
 use crate::context::RpcContext;
 use crate::id::{Id, InvalidId};
 use crate::s9pk::manifest::PackageId;
-use crate::util::{IoFormat, ValuePrimative, Version, display_serializable, parse_stdin_deserializable};
+use crate::util::{
+    display_serializable, parse_stdin_deserializable, IoFormat, ValuePrimative, Version,
+};
 use crate::volume::Volumes;
 use crate::{Error, ResultExt};
 
@@ -80,7 +82,7 @@ pub enum ActionResult {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ActionResultV0 {
     pub message: String,
-    pub value: ValuePrimative,
+    pub value: Option<String>,
     pub copyable: bool,
     pub qr: bool,
 }
@@ -183,8 +185,12 @@ fn display_action_result(action_result: ActionResult, matches: &ArgMatches<'_>)
     }
     match action_result {
         ActionResult::V0(ar) => {
-            println!("{}: {}", ar.message, serde_json::to_string(&ar.value).unwrap());
-        },
+            println!(
+                "{}: {}",
+                ar.message,
+                serde_json::to_string(&ar.value).unwrap()
+            );
+        }
     }
 }
 
diff --git a/appmgr/src/manager/mod.rs b/appmgr/src/manager/mod.rs
index fcd8c1fc0..eb0960fc2 100644
--- a/appmgr/src/manager/mod.rs
+++ b/appmgr/src/manager/mod.rs
@@ -351,7 +351,8 @@ impl Manager {
             .await
         {
             Err(bollard::errors::Error::DockerResponseNotFoundError { .. })
-            | Err(bollard::errors::Error::DockerResponseConflictError { .. }) => (), // Already stopped
+            | Err(bollard::errors::Error::DockerResponseConflictError { .. })
+            | Err(bollard::errors::Error::DockerResponseNotModifiedError { .. }) => (), // Already stopped
             a => a?,
         };
         self.shared.status.store(
@@ -413,7 +414,8 @@ impl Manager {
             .await
         {
             Err(bollard::errors::Error::DockerResponseNotFoundError { .. })
-            | Err(bollard::errors::Error::DockerResponseConflictError { .. }) => (),
+            | Err(bollard::errors::Error::DockerResponseConflictError { .. })
+            | Err(bollard::errors::Error::DockerResponseNotModifiedError { .. }) => (), // Already stopped
             a => a?,
         };
         self.shared.status.store(
diff --git a/appmgr/src/status/mod.rs b/appmgr/src/status/mod.rs
index 0c3e45e60..85bee780a 100644
--- a/appmgr/src/status/mod.rs
+++ b/appmgr/src/status/mod.rs
@@ -301,7 +301,9 @@ impl MainStatus {
             },
             ManagerStatus::Running => match self {
                 MainStatus::Stopped | MainStatus::Stopping | MainStatus::Restoring { .. } => {
+                    dbg!("stopping");
                     manager.stop().await?;
+                    dbg!("stopped");
                 }
                 MainStatus::Running { .. } => (),
                 MainStatus::BackingUp { .. } => {
diff --git a/patch-db b/patch-db
index 96ab78f8b..d26e1563e 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 96ab78f8b0c560f50c3c59ae61a1b151a751076d
+Subproject commit d26e1563e87a7a59d328176b810429ab4056cb17