From 19d1e905a2da601b1321702797d545ac5900c493 Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Sat, 11 Sep 2021 17:54:03 -0600
Subject: [PATCH] no output for dependency and backup actions

---
 appmgr/src/backup/mod.rs   | 11 ++++++-----
 appmgr/src/dependencies.rs |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/appmgr/src/backup/mod.rs b/appmgr/src/backup/mod.rs
index 40b42b919..e24725a62 100644
--- a/appmgr/src/backup/mod.rs
+++ b/appmgr/src/backup/mod.rs
@@ -1,8 +1,9 @@
 use anyhow::anyhow;
 use patch_db::HasModel;
+use regex::NoExpand;
 use serde::{Deserialize, Serialize};
 
-use crate::action::ActionImplementation;
+use crate::action::{ActionImplementation, NoOutput};
 use crate::context::RpcContext;
 use crate::s9pk::manifest::PackageId;
 use crate::util::Version;
@@ -21,7 +22,7 @@ impl BackupActions {
         pkg_id: &PackageId,
         pkg_version: &Version,
         volumes: &Volumes,
-    ) -> Result<(), Error> {
+    ) -> Result<NoOutput, Error> {
         let mut volumes = volumes.to_readonly();
         volumes.insert(VolumeId::Backup, Volume::Backup { readonly: false });
         self.create
@@ -37,7 +38,7 @@ impl BackupActions {
             .await?
             .map_err(|e| anyhow!("{}", e.1))
             .with_kind(crate::ErrorKind::Backup)?;
-        Ok(())
+        Ok(NoOutput)
     }
 
     pub async fn restore(
@@ -46,7 +47,7 @@ impl BackupActions {
         pkg_id: &PackageId,
         pkg_version: &Version,
         volumes: &Volumes,
-    ) -> Result<(), Error> {
+    ) -> Result<NoOutput, Error> {
         let mut volumes = volumes.clone();
         volumes.insert(VolumeId::Backup, Volume::Backup { readonly: true });
         self.restore
@@ -62,6 +63,6 @@ impl BackupActions {
             .await?
             .map_err(|e| anyhow!("{}", e.1))
             .with_kind(crate::ErrorKind::Restore)?;
-        Ok(())
+        Ok(NoOutput)
     }
 }
diff --git a/appmgr/src/dependencies.rs b/appmgr/src/dependencies.rs
index 72d46da25..f8a080506 100644
--- a/appmgr/src/dependencies.rs
+++ b/appmgr/src/dependencies.rs
@@ -4,7 +4,7 @@ use indexmap::IndexMap;
 use patch_db::{DbHandle, DiffPatch, HasModel, Map, MapModel};
 use serde::{Deserialize, Serialize};
 
-use crate::action::ActionImplementation;
+use crate::action::{ActionImplementation, NoOutput};
 use crate::config::Config;
 use crate::context::RpcContext;
 use crate::db::model::CurrentDependencyInfo;
@@ -226,7 +226,7 @@ impl DependencyConfig {
         dependent_version: &Version,
         dependent_volumes: &Volumes,
         dependency_config: &Config,
-    ) -> Result<Result<(), String>, Error> {
+    ) -> Result<Result<NoOutput, String>, Error> {
         Ok(self
             .check
             .sandboxed(